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
Merge pull request #29 from dylanerichards/master

merging my update
configure for heroku
delete and readd gemfile.lock for heroku
move sqlite3 to development/test group
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
began a few tests for controllers
cannot pull till i commit these files
Merge pull request #30 from user1011/master

Add edit/delete to answers
merge conflicts
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

spec tests
spec tests
made most test work
Merge pull request #31 from dabeeya/master

few tests
add comments for presentation
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	log/development.log