Martin commitar igen
Merge branch 'master' of github.com:mrapan/gitskolan
hej
Merge branch 'master' of github.com:mrapan/gitskolan

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

Conflicts:
	FUN
Har skriver jag pa svenska men det far jag inte, dann schreiben wir im Deutsch!!!
hejhej igen
Merge branch 'master' of github.com:mrapan/gitskolan

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

Conflicts:
	FUN