removed .vagrant folder
working on objects
Fixed merge issue with Colin's gitignore