New character and movement
Merge branch 'master' of https://github.com/theblacknight/beacon

Conflicts:
	main.lua