animation
Merge branch 'master' of github.com:thorn0/tamadroid

Conflicts:
	app/scripts/controllers/main.js