New combo added.
Merge branch 'master' of https://github.com/gamelab/GhostFighter

Conflicts:
	build/ghostfighter-0.1.0.min.js