Bunch of stuff
Merge pull request #3 from shannontan94/shannonbranch

Bunch of stuff