Merge branch 'Convert-to-WP-Theme'
Merge pull request #1 from lukesturgeon/master

Merge branch 'Convert-to-WP-Theme'