* changes
* characters
* jquery include
Merge branch 'master' of https://github.com/ddanninger/fingertown

Conflicts:
	js/game.js
	js/resources.js