Second commit
Merge branch 'master' of https://github.com/bsocius-development/www.bsocius.org