Uploading html
new file
hello world
Messing about with git
the best
New commit
boop
removed shit
added list
added lists
Deleted boop and git html files
Merge branch 'master' of ssh://datfatcat.com/home/joemb/git/datfatcat

Conflicts:
	html/git.html
Removed script line
renamed stylesheet.css to dfc.css
Testing out git branch
updated index.html
Added stuff
updated
Merge branch 'Test'
Changed css colours