Saving
Merge branch 'master' of https://github.com/HackVT-Stone/energy

Conflicts:
	app/views/main.html