Renamed Player to PlayerBlock
Renamed Input to Player
Merge branch 'master' of https://github.com/xordspar0/cfl

Conflicts:
	main.lua
Merge main.lua from master