peter is much much better
Merge branch 'master' of https://github.com/maceopark/hellogit

Conflicts:
	favCharacter