Delete comments form answers controller
Remove errant @ symbol from _navbar
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	app/views/questions/show.html.erb
Add answer  edit and delete buttons to question view
Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	app/views/questions/show.html.erb
Add edit and delete buttons to answers view
Add update method, edit method for editing answers
Merge pull request #30 from user1011/master

Add edit/delete to answers