aa
aa
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013

Conflicts:
	silence/silence/Bat.cpp
	silence/silence/Game.cpp
Merge branch 'sean'

Conflicts:
	silence/silence/Kriminel.cpp