Merge pull request #66 from mentatzoe/master

Office code
anthony's code

anthony's code
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Test

test test