Hajotin kaiken lol
asd
Merge branch 'master' of github.com:nortti/wadror

Conflicts:
	test