animate between display and edit
gitignore
Merge branch 'master' of https://github.com/thecapsaicinkid/shoryuken

Conflicts:
	.gitignore