Lots of stuff Yall, Nien Nien Nien
Merge branch 'master' of https://github.com/mennomiddel/okesjon

Conflicts:
	package.json
last second chage