starting to style
Merge branch 'master' of https://github.com/jheg/GCEnergy

Conflicts:
	index.php
	style.css