fuck
Merge branch 'master' of github.com:seanrclayton/footgolf

Conflicts:
	Gemfile.lock
poopoo