Whitespace adjustments
Bug fix
Merge branch 'master' of https://github.com/EnergyLiving/Homework

Conflicts:
	homework5/hw5.js