Boyscout add enter. Also commit to be able to create a pull request
Merge pull request #3 from eMergence-by-Design/add-guard

REVIEW: Add Guard
Merge branch 'master' into user-profiles
Merge branch 'master' into feature/stories
Merge branch 'user-profiles' into feature/stories

Conflicts:
	app/models/user.rb
Merge branch 'feature/stories' into feature/add-stories