Test commit, making sure Git doesn't mess up on my machine.
Merge branch 'master' of https://github.com/aplabs/bsos.git
Merge branch 'master' of https://github.com/aplabs/bsos