Lol, jag ska pulla ner här nu xD
Merge branch 'master' of https://github.com/Splux/Project-kindergarten

Conflicts:
	.gitignore