Initial commit
Merge https://github.com/InvalidToken/JPMC2014Team-7