Got endpoints working maybe
stuff
Should be fine
Finished webpage, fully functional, apart from register and login!
Created .gitignore file
Delete .DS_Store
Delete .DS_Store
Start and end location working

YAY! :D
Merge branch 'master' of https://github.com/jubjubbird01/hide-and-street

Conflicts:
	app/assets/stylesheets/styles.css.scss
	app/views/game/show.html.erb
Playing whack-a-mole with .DS_Store files
Random endpoint chosen from database
Merge branch 'master' of https://github.com/jubjubbird01/hide-and-street
Included initial JS: setup Street view, compare distances, manage IDs
Merge branch 'master' of https://github.com/jubjubbird01/hide-and-street
Stuff has happened...
Resolved merge conflict in show.html.erb
Merge branch 'master' of https://github.com/jubjubbird01/hide-and-street

Conflicts:
	app/assets/javascripts/locations.js
	app/views/game/show.html.erb
Fixed accidental deletion of a bunch of important code!
Login system up and running
Merge branch 'user-logins'

* user-logins:
  Login system up and running

Conflicts:
	app/views/game/show.html.erb