small changes
small change
updated settings to take on static and media and template file implemented
Merge pull request #2 from rocketu/johnny-branch

Johnny branch
convergent