changed associations with participants feelings
added feeling table to archive view
fixed merge conflict
uncommented first_time_login test
Merge pull request #64 from kexline4710/feelings_join

Feelings join