sf
ds
Merge branch 'master' of https://github.com/MarcusSorealheis/detroitems

Conflicts:
	log/development.log