Minor changes
Merge branch 'master' of https://github.com/hili93/Halma into hicham-minor-changes

Conflicts:
	makefile
	src/main-c.c
Merge pull request #14 from RyDroid/hicham-minor-changes

Hicham minor changes