merging previous upstream
merging previous upstream
added pointable
migrated in most recent changes, resolved conflict with users model
updated points action
Merge branch 'master' of github.com:lalanikki/habit-app
added post controller
Merge pull request #25 from rugbycub/add_post_controller

Add post model