much better
Merge branch 'master' into develop

* master:
  init
Merge branch 'master' into develop

* master:
  added map link
  live updating scores
  added current score
  ordering holes
  toned down the fonts
  adding gem
  another ios attept at change
  re formate
  more playing for ios
  fussing with aa assets
  trying on blur for ios
  small updates
  fixed sp error in pipeline addtion
  added active admin assts to pipeline
  cleaning house
  almost useable
a cluster fuck JUST happened and i am too dumb to figure out git to fit it. Eligstgst
working on relating multiple users to a game
Merge branch 'develop' of https://github.com/theprogram/floppy-disc into develop

* 'develop' of https://github.com/theprogram/floppy-disc:
  a cluster fuck JUST happened and i am too dumb to figure out git to fit it. Eligstgst

Conflicts:
	app/assets/javascripts/app.js.coffee
	app/assets/stylesheets/app.css.sass
	app/views/games/show.haml
	app/views/pages/index.haml
Merge branch 'master' into develop

* master:
  changed time format for last game played
  added green/red to score. ie, it shows green if under par or red if over par.
  added gem for better_errors
  added normalize css
  changed order of projects

Conflicts:
	app/assets/javascripts/app.js.coffee
	app/assets/stylesheets/app.css.sass
	app/views/games/show.haml
	app/views/pages/index.haml