updated basic php structure and ignored file list
updated .gitignore merge conflict