fixed bugs + big redesign
Merge branch 'master' of github.com:joeforshaw/convinced-of-the-hex