committing so I can pull new seed data from database without conflicts
commit new seed data from merge
 added a few changes to contacts and profile page. committing to accept changes from noah's show pages for meet and invites
Merge remote-tracking branch 'upstream/master'

Merging from Noah's addition of a meet and invite show page
added gem for heroku
Merge pull request #7 from kaplanoah/master

Changes for Heroku
preparing files for handlebar templates. added handlebars
added check to avoid errors if user tries to make invite without having any contacts, or doesnt select a contact
Merge remote-tracking branch 'upstream/master'

Merged for both heroku gems and handlebars
Merge pull request #8 from kaplanoah/master

Added checks to avoid errors when creating invites
merged in new version with invite checks from noah
added ability to add contact by searching by username, and validated that usernames are unique
Handlebars template works with contact show page, but continuously adds contacts to page. working on fix
Merge pull request #9 from kaplanoah/master

added ability to add contact by searching by username
pressing contacts now runs ajax call to grab user's contacts
added display of incoming and outgoing invites, fixed bugs in invites create method and jquery
Merge pull request #10 from kaplanoah/master

added display of incoming and outgoing invites
pulling in search and validations from upstream master
updated changes to support merge. changed index, meets controller and application css
Merge pull request #11 from gthetwong/master

Add in User profile page, Contacts from ajax request