Made a change
Made other changes
Added stylesheet
Added changes to index to link to stylesheet
fixed broken thingy
Finished our testing.
Merge branch 'testing'

Conflicts:
	index.html