dwad
map
Merge branch 'sebastian'
mcDerp
dwa
Merge branch 'linder'
Huts klara
Merge branch 'sebastian'
hej allihop enenen
hej
Merge branch 'sean'

Conflicts:
	silence/silence/Player.cpp
	silence/silence/Player.h
	silence/silence/Weapon.cpp
	silence/silence/Weapon.h
	silence/silence/silence.vcxproj.filters
Merge branch 'Jimmy'

Conflicts:
	silence/silence/EntityManager.cpp