Added stylesheet
merge test
Merge test continued
Merge branch 'conflict'

Conflicts:
	readme.md
Merges part 2
Merge part 2 cont
Merge branch 'conflict'

Conflicts:
	readme.md
Merge branch 'gh-pages'
Took out footer