Meaningless Changes
Merge branch 'master' of https://github.com/userotti/Gresher

Conflicts:
	song.html
Merge branch 'master' of https://github.com/userotti/Gresher
Merge branch 'master' of https://github.com/userotti/Gresher
Merge branch 'master' of https://github.com/userotti/Gresher
Merge branch 'master' of https://github.com/userotti/Gresher
Merge branch 'master' of https://github.com/userotti/Gresher
Merge branch 'master' of https://github.com/userotti/Gresher
Canvas Positioning and Page Reload-and-Fit work
Merge branch 'master' of https://github.com/userotti/Gresher

Conflicts:
	js/towerpresets.js