it wants me to commit...
Merge branch 'master' of https://github.com/JP-Ellis/Cool-Roof

Conflicts:
	half-day.py