added new gem, first and last name to users
added new gem, first and last name to users
fix merge error
Merge pull request #8 from slwaller/master

added new gem, first and last name to users