pulled upstream master
ppull upstreams
added some js logic that I am going to save a use for later, so it is commented out for now
added helper method for sesssions
added logic to view so only curren user can edit and delete
added 'back' button while user is signed on
refactored flash notice inside of topics controller
added current user can only delete their comments
logs
Merge pull request #43 from stcrestrada/master

Merge 2 Estrada
work on profile page and view
Merge branch 'master' into john

Conflicts:
	db/development.sqlite3
	log/development.log
Merge pull request #44 from woolly-bear-caterpillars-2014/john

John
Fix merge conflict