testen van gitignore
Merge branch 'master' of https://github.com/timartesis/codeandballs
Merge branch 'master' of https://github.com/timartesis/codeandballs

Conflicts:
	.gitignore