First commit before bug-fixing
* Fixed some bugs
* Modified .gitignore
* TODO fix colours
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore