Merge pull request #1 from jonpugh/live

Create page-node-1.tpl.php
Rename page-node-1.tpl.php to page--node--1.tpl.php
Update page--node--1.tpl.php
Rename page--node--1.tpl.php to node--1.tpl.php
Update node--1.tpl.php
Update node--1.tpl.php
Merge pull request #2 from jonpugh/master

new about page