Merge pull request #6 from billy1339/master

merging the styling
touching up templates