Heroku fix
Update application.rb
Merge remote-tracking branch 'origin/master'
Gemfile change
Merge branch 'umass_branch'

Conflicts:
	.gitignore
	Gemfile
Revert "Merge branch 'umass_branch'"

This reverts commit 0b337a85b262fa78307483260d290671161fdbbb, reversing
changes made to 5d5c37fd8808a419bfa98fae4956d85fe88e62fc.
Merged
Fix for gemfile
Merged
Merge remote-tracking branch 'upstream/master'
Merge pull request #154 from jjliang/master

merge me
Merge remote-tracking branch 'heroku/master'

Conflicts:
	app/models/feedback.rb
Revert "Merge remote-tracking branch 'heroku/master'"

This reverts commit e097aaaa59d9c3864c7ed97f456e888f23d48230, reversing
changes made to fdd295f6d68d3c3930b42f090f939597c2f0ba42.
Gemfile fix
fixing merge conflicts
changing mail to