- Add Home & Stone as an Ember user
Merge branch 'master' of https://github.com/tekay/website into tekay-master

Conflicts:
	data/users.yml