TDD assignment
Merge remote-tracking branch 'mhabib/master'

Conflicts:
	src/test/java/com/shapestone/labs/ShoppingCartTest.java