Deleted some stupid shit
Added closing PHP tag.
Merge branch 'master' into kyle