almost
conflict resolved
start on matching styles
design done
try again
merging in ollie's changes
Merge pull request #12 from wweliz/olliegill-master

Resolved merge conflicts; merging into master