Squashed 'apache2/' content from commit 6983b8d

git-subtree-dir: apache2
git-subtree-split: 6983b8d888de6e69bc191916456e944b088fc2cb
Merge commit '0c0ef160914f5365cde36fcb7379d91a16745a4c' as 'apache2'
Removing unwanted files
Squashed 'recipes/cookbooks/apache2/' content from commit ec9b063

git-subtree-dir: recipes/cookbooks/apache2
git-subtree-split: ec9b063554d5d464567c8cd4f03766a3dfcfde12
Merge commit '55370842be0d02bac7b3a0527dd3649f17bd3f73' as 'recipes/cookbooks/apache2'
Squashed 'recipes/cookbooks/php/' content from commit ec267f9

git-subtree-dir: recipes/cookbooks/php
git-subtree-split: ec267f94272f5fb9071c47a40b35dfa7196ef7cf
Merge commit '1b9762fd9ad1e44129bd20a893897c995f552145' as 'recipes/cookbooks/php'
Vagrant file changes
Ignoring .project
Squashed 'recipes/cookbooks/apt/' content from commit 27a63b7

git-subtree-dir: recipes/cookbooks/apt
git-subtree-split: 27a63b72ada97ff716901ee7d6a86315767672e0
Merge commit '8a6cd25b5052444bf3f2a693b4cab5161111e2b5' as 'recipes/cookbooks/apt'
networking_basics
resolve confilct