Hobbit conflicting change.
Merge branch 'master' into hobbit-feet-feature
Merge pull request #4 from amcbrearty/hobbit-feet-feature

Hobbit feet feature
Merge remote-tracking branch 'origin/master' into bushy-beard-feature

Conflicts:
	non-feature.txt