Merge branch 'master' of github:alpaca-tc/alpaca-tc.github.io