Resolves merge conflicts.
Changes db seed file to delete all existing data and create two admin users
Adds functionality to append EventVenue distance from current_user location.
Adds assets initialize_on_precompile to false in confid/application.rb
adds bootstrap-sprockets.hs to assets/js files
Replaces the bootstrap-sass gem with shehryar's forked version of the gem and removes bootstrap sprockets js file
Resolves schema merge conflict and adds files to gitingore.
Adds social button styling to sign in with google button