Merge pull request #4 from AssassinManager/staging

Base features + 2 custom modules
Added theme

plus subtheme
Merge pull request #7 from alexjewellalex/master

Base theme.