modif
Merge branch 'master' of http://github.com/sexysoushi/Kanban

Conflicts:
	main.c
	main.c~