added my name
Merge remote-tracking branch 'origin/master'

Conflicts:
	omg.txt
Merge branch 'master' of https://github.com/Miklelottesen/dragonslair