Added character generation
Merge branch 'master' of https://github.com/brdunfield/GGJ2014

Conflicts:
	character.js
	engine.js