Merge pull request #1 from thealscott/corin

Corin
Merge branch 'master' of https://github.com/thealscott/cms-template into corin
added htaccess with modrewrite to try and clean up url

formatting