Merge remote-tracking branch 'joshua/master'
Merge remote-tracking branch 'george/master'
added css file
Merge remote-tracking branch 'joshua/master'
Fixed spacing in index.html
fixed index.html
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html