error fixing I think
Merge branch 'master' of https://github.com/isiloron/shiny-bear
Merge branch 'master' of https://github.com/isiloron/shiny-bear
fixing haxing
Merge branch 'master' of https://github.com/isiloron/shiny-bear