Started working on Adding Stock Control
Merge branch 'master' of https://github.com/jthompsonNB/PetStore

Conflicts:
	src/main/java/org/agoncal/application/petstore/service/DBPopulator.java