Change 1?
Merge branch 'master' of https://github.com/DanteMaxwell/CharacterGen

Conflicts:
	character.rb