Started to work on player, but it breaks ALL THINGS, LOL
Merged
Merge branch 'master' of github.com:Nockess/nockess-dev

Conflicts:
	main.c
Merged