editing stuff and things
Merge branch 'dev' of https://github.com/anthonycorradi/binview into dev