asdasdasd
Merge branch 'Jimmy'
asdasd
asdasdMerge branch 'sean'

Conflicts:
	silence/silence/Bat.cpp