inital merge with bitbeam
Merge branch 'master' of github.com:logmein3546/branson