ignore
Merge branch 'master' of https://github.com/christianvermeulen/mtbci2013.git
Merge branch 'master' of https://stollie@github.com/christianvermeulen/mtbci2013.git

Conflicts:
	.gitignore
Meer ignore
Zoeken naar tag in message. Anders random geluid.
Merge branch 'master' of https://stollie@github.com/christianvermeulen/mtbci2013.git
Awesome feature to say which sound you want by using a hastag in your commit message - thanks to stollie