fixed git conflicts. changed vagrant provisioning to ansible on VM (instead of ansible on host).
html syntax error removed