Added percentage display toggle functionality / minor tidy
Resolved conflict
Merge remote-tracking branch 'upstream/master'
Merge pull request #14 from thomas-squid/master

Added percentage display / Resolved conflicts.