modified map image layover position and increased map size
Merge branch 'master' into placing_markers
fixed server side create checkin logic
modified js so marker is placed and correct info put in for pop up
created new route for user_checkins
Merge branch 'master' into placing_markers

Conflicts:
	app/assets/javascripts/applicationController.js
	app/assets/javascripts/init.js
	app/assets/stylesheets/checkin_page_styles.css.scss
	app/controllers/application_controller.rb
	config/routes.rb
changed artist_name method to artist
Merge branch 'master' into placing_markers
made default map zoom closer
added demo stuff
now displaying distance to OSL if not on festival grounds
added artist_id to checkins table and modified logic to use the connection
changed playlist view to what it was before demo changes
change display of time, font-size, and div height on playlist page
added border between checkins on playlist page, made artist names bigger, location names smaller
Merge pull request #13 from nickmeehan/placing_markers

Placing markers