added p aside tags for button styling
Merge branch 'master' of https://github.com/walterlatimer/goodmeasure
added button styling
updated small header merge conflict