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

Conflicts:
	silence/silence/Animation.cpp
	silence/silence/Animation.h