add strig all rights reserved
Merge branch 'master' of heroku.com:ucalendars

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
remove sinatra flash from app
add before do for allow access control allow origin and methods and add in all endpoint content type json
Merge branch 'master' into develop