player
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence.sdf
	silence/silence.suo
	silence/silence/Debug/CL.read.1.tlog
	silence/silence/Debug/CL.write.1.tlog
	silence/silence/Debug/cl.command.1.tlog
	silence/silence/Debug/main.obj
	silence/silence/Debug/silence.log
	silence/silence/Debug/vc100.idb
	silence/silence/Debug/vc100.pdb
	silence/silence/silence.vcxproj
	silence/silence/silence.vcxproj.filters
player
APA
kalle
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence/Animation.cpp
	silence/silence/Animation.h
fix
Merge branch 'master' of https://github.com/adeadrat/GameJam13
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence.sdf
	silence/silence.suo
	silence/silence/Animation.cpp
	silence/silence/Animation.h
Update .gitignore
Merge branch 'master' of https://github.com/adeadrat/GameJam13

Conflicts:
	silence/silence.sdf
	silence/silence.suo