new file:   files/apache2.conf
Merge branch 'master' of https://github.com/alemazz/lamp

Conflicts:
	files/apache2.conf

	modified:   files/apache2.conf