Merges create and edit char forms
Merges create and edit char forms
Beautification
Merge branch 'ui-ux'

Conflicts:
	public/scripts/events.coffee
	public/scripts/events.js
Resolving conflict
Merge pull request #4 from LipGlossary/ui-ux

Ui ux