Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
Merge pull request #27 from user1011/master

Fix user_id in answer controller
add user profile to navbar
change default scope of Question to created_at DESC
removed the tmp files
some minor updates to bug issues
Merging michaels updates
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
Merge pull request #28 from vivekmgeorge/master

updated the files
save before pull
merge conflicts
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
updated the index page a little
removed div that was not required
need to remove rails given test folders
Merge pull request #29 from dylanerichards/master

merging my update
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