added a word
Merge branch 'master' of github.com:mrapan/gitskolan

Conflicts:
	FUN