Merge branch 'kyle'
changed <? to <?php, my interpreter was angry
Merge branch 'master' into kyle