version 2.0 of index.php
Merge branch 'master' of https://github.com/atomicon/test into Branch_2.0