heres some stuff
Merge branch 'master' of https://github.com/Sailorflares/Cabbie

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
YOU MUST HAVE 10 CHARACTERS TO PASS GO
Merge branch 'master' of https://github.com/Sailorflares/Cabbie