Merging
Clean up
Merge branch productCreation
Moved Vagrant files to the Vagrant folder