cleaned the FUN file
fixade fun igen
fixed stuff
added linus
added apan
Merge branch 'master' of github.com:mrapan/gitskolan

Conflicts:
	FUN
Merge branch 'master' of github.com:mrapan/gitskolan

Conflicts:
	FUN