CSS creation
Merge remote-tracking branch 'origin/master'

Conflicts:
	final/index.html
Merge branch 'master' of https://github.com/nat3mac/Solar-Decathlon