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
edited readme
updated routes file; created basic controllers
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop
add travis
resolve merge issue in readme.md
changed login page to welcome
can add and view posts
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop
resolved route conflict
can edit/ update posts
built out points_transfer_controller and transfer_points method on user
resolved merge conflict
can add picture
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop
fix merge conflict
fixed routing conflict