tjenare you guys
Merge branch 'linder'

Conflicts:
	silence/silence/MegaSuperHackerGuy.cpp