On branch master
 Changes to be committed:
	new file:   setuplamp4magento
	modified:   setuppptp
Merge branch 'master' of https://github.com/visi-pivi-sivi/PI6