Merge branch 'master' of github.com:Edentic/VagrantSetup
Merge branch 'develop'
Renamed main file
Merge branch 'hotfix/rename_main_file' into develop