Merge branch 'master' of github.com:GuidoVanSanten/Brab

Conflicts:
	.gitignore
Merge branch 'master' of github.com:GuidoVanSanten/Brab