Start
Merge branch 'master' of https://github.com/Commandersatisfied/Fred-tuin

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Commandersatisfied/Fred-tuin