avout
Merge branch 'master' of https://github.com/tuanequintella/spjam2014

Conflicts:
	Assets/Sprites/Character/Thumbs.db.meta