Heheheheheh
Merge branch 'ugliness'

Conflicts:
	Hej.java