test commit to trigger travis
Merge branch 'master' of github.com:AmericanCouncils/AyamelResourceApiServer
Merge branch 'master' of github.com:AmericanCouncils/AyamelResourceApiServer
update vagrant file for memory and dns management
Merge pull request #158 from cmac1000/vagrant-update

Vagrant update