fixed box bug
Tabbing!
Merge branch 'Felix-gren'

Conflicts:
	ny.pl