Add Colors
Merge branch 'devel' of github.com:jpascale/Project-X into devel

Conflicts:
	src/minokufront.c