updated styling
Merge branch 'master' of github.com:ElectricEasel/btr
test..
Merge branch 'dev'