passing recipient id through hidden field to emails controller
changes from last merge
fix merge conflict in schema.rb
email work
uncomment seeds, migrate it
add email to people table
merging with remote master

Merge branch 'master' of https://github.com/cdcueva/oliwi into add_email_to_people_table
seed email to people
Merge pull request #37 from cdcueva/add_email_to_people_table

Add email to people table