hej
Merge branch 'sean'
aa
aa
Merge branch 'Jimmy'
player collrect
Merge branch 'master' of https://github.com/PutBoy/GameJam-2013
asd filer bonmemace
Merge branch 'sean'
asd filer
MEGASUPERHACKERGUY
Merge branch 'Jimmy'
hej wep kan skjuta typ
Merge branch 'sean'
sean
asd
hej
Merge branch 'linder'

Conflicts:
	silence/silence/Player.cpp
	silence/silence/Player.h
	silence/silence/silence.vcxproj.filters