update by jack 3:53 PM 12/4/2014
Merge branch 'master' of https://github.com/iYottt/boffice