Update Gemfile.lock for Heroku
add precomplied assets for heroku
moved everything
add root path
create API helper and corresponding tests for its functions, which allow queries on the db using params hash that have to be formatted. User can now query the db for events and categories by their names using api query
fix merge where .git file was moved to rails app directory from its parent dir
remove nested rails app
rewords home page, sorts events by date
resolves merge conflict, moves files up one folder so that git can follow them and launch to heroku