controlls is not finished
fixed merge conflict
fixed merge conflict
controls
controls
controls
controlls
Merge branch 'master' of https://github.com/richteer/iiag

Conflicts:
	.gitignore
	Makefile
	src/io/input.c
	src/main.c