Merge pull request #9 from iamtimm/UpdatedSiteDesign

(In Progress) Updated the design of the homepage
minor tweaks to tim's awesome theme
Fixed conflicts