deleted file
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop

Conflicts:
	app/controllers/session_controller.rb
added posts controller
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into add_post
can add and view posts
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop
resolved route conflict