working on animation for running off cliff
Merge branch 'master' of https://github.com/syneva/greenSock

Conflicts:
	app/scripts/main.js