Test
Revert "Test"

This reverts commit bf730c92193d690bb03e1a2f86155d4e8a63db3a.
Merge remote-tracking branch 'origin/Colin'
Merge branch 'master' of https://github.com/vividdream/stockodin