Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
remove vagrant files
ignore vagrant files
Merge branch 'master' into develop