Added .htaccess file for permalinks
Committing leftover files
Resolving conflict insanity
Merge branch 'master' of github.com:nandorocker/vagrant-basic-lamp

Conflicts:
	.gitignore
	README.md
	Vagrantfile