Geoffrey Testelin C0ZEN

Add the remote, call it "upstream":

Fetch all the branches of that remote into remote-tracking branches

git fetch upstream

Make sure that you're on your master branch:

	<!doctype html>
	<html class="no-js" lang="">

	<head>
	<meta charset="utf-8">
	<title>Defloc</title>
	<meta name="viewport" content="width=device-width, initial-scale=1">
	<style rel="stylesheet">
	@font-face {
	font-family: "Oswald";

	<!doctype html>
	<html class="no-js" lang="">

	<head>
	<meta charset="utf-8">
	<title>Defloc</title>
	<meta name="viewport" content="width=device-width, initial-scale=1">
	<link rel="stylesheet" href="main.css">
	</head>

	container
	progress-bar

	container
	loader