good stopping point
working on marking questions answered
fixed merge conflict in questions index erb
changes
updates to user index and show
local changes
Merge branch 'master' of https://github.com/nicholalexander/project2 into catchup
Merge pull request #26 from nicholalexander/see-all-users

See all users
Merge branch 'master' of https://github.com/nicholalexander/project2 into canlogin
fixed the jquery selector on question form to only grrab that form, added the better errors gem, question answered button working, only appears for teachers
Merge pull request #27 from nicholalexander/markanswered

Markanswered
each students name links to question page
Merge pull request #28 from nicholalexander/canlogin

Can login
upvoting a question now redirects to questions path, the already voted error page updated to be more informative
questions display posters name instead of ID
Merge pull request #29 from nicholalexander/smallchanges

Smallchanges
fixing merge conflicts