Refactor controls/input away.
Merge branch 'refuctored' into ui

Conflicts:
	main.lua