Merge branch 'master' of https://github.com/johnttan/canvas_sidescroller

Conflicts:
	README.md
Merge branch 'master' of https://github.com/johnttan/canvas_sidescroller