divider
conflict fix

I recieved a conflict and then it shoved all these files onto my commit
that someone else was working on.
Merge branch 'homepage' of https://github.com/Gavin-McCormick/watttime into homepage

Conflicts:
	static/css/style.css