Merge branch 'bossteach' of https://github.com/billni/bossteach.git into bossteach