merge with master
merge local api working
local merge
Merge branch 'master' of github.com:dustin520/text_later_app
work on rspec