windows XAMPP instructions
:Merge branch 'master' of github.com:samuraisam/myfirstwebapp