Testing...

I still rock
Merge remote-tracking branch 'origin/master'

Conflicts:
	Stefan.txt
Merge branch 'master' of https://github.com/star-yellow-team/WhoAmI
Merge branch 'master' of https://github.com/star-yellow-team/WhoAmI