adding berksfile.lock
[feature/git] added git to vm
[feature/apache] merging develop into feature/apache
[feature/apache] base apache install working
[feature/apache] apache working with php now