Merge pull request #1 from lnolson/master

update my repo
Add Show page for Events
Added Views for Messages, new and _form
Added Answer Views
Update to the users#index view page. I added ID because currently there is no way for users to enter first or last names, and the users#show page hasn't been created yet so I don't have a link for that yet.
Revisions made to Events ‘show’ page & Events Controller
Added Answers Index page, Answers controller and edited create_answers migration
no message
Added Questions index view template.  Not sure if value page works correctly and it’s pretty difficult to test without a show template.
Merge pull request #53 from edsalisb/master

Added a Questions/Index view template.
Merge pull request #42 from aboccieri/master

Add Show page for Events
Merge pull request #46 from stcho/master

Added Views for Messages, new and _form
Merge pull request #47 from mrennema/master

Update to the users#index view page. I added ID ...
Edited amount of messages seen at once
Merge branch 'master' of https://github.com/lnolson/snapp into upstream
Added first_name and last_name text fields
Modify image controller, edit show view
Merge branch 'master' of https://github.com/lnolson/snapp

Conflicts:
	app/views/users/index.html.erb
Updated Answer Stuff
Merge pull request #50 from katlyn33/master

Added Answer Views