going through, typing out example
login.php wuts with line 47
Merge branch 'master' of github.com:hossthebossross/firstWebsite