lab 10/25 steps 1-8
mMerge branch 'master' of https://github.com/mklbtz/ecommerce

Conflicts:
	log/development.log