Merge remote-tracking branch 'origin/master'

Conflicts:
	rpswar/Assets/My Sprites/button_paperDown.png.meta
	rpswar/Assets/My Sprites/button_paperUp.png.meta
	rpswar/Assets/My Sprites/button_rockDown.png.meta
	rpswar/Assets/My Sprites/button_rockUp.png.meta
	rpswar/Assets/My Sprites/button_scissorsDown.png.meta
	rpswar/Assets/My Sprites/button_scissorsUp.png.meta
checks victory condition
bug fixes
Merge branch 'dev-branch'
Okay
Merge branch 'master' of https://github.com/pencilgym/droppodgames_CardinalJam2014
animations
Merge branch 'master' into dev-branch