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

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