stuff
Merge branch 'master' of https://github.com/tmooney3979/carscout

Conflicts:
	log/development.log