Resolves merge conflicts.
Adds functionality to append EventVenue distance from current_user location.
Resolves schema merge conflict and adds files to gitingore.