Removed the theme that was causing GitHub to Complain
merging

Merge branch 'master' of github.com:marchon/marchon.github.com