up and running
Merge branch 'going-to-try-to-fix-the-line-in-the-php'