favCharacter is Homer Simpson
Merge branch 'master' of github.com:maceopark/hellogit

Conflicts:
	favCharacter