SF2
Merge branch 'gh-pages' of https://github.com/edgarmarquez/jquery-streetfighter1 into gh-pages

Conflicts:
	css/main.css