update
Merge branch 'master' of https://github.com/nikkithomas/jquery-streetfighter3

Conflicts:
	js/app.js