James branch

I wanted to try and keep my code in a branch so that everyone could have their own branches off of the master and we wouldn't have any merge conflicts. I'm not 100% sure I'm doing this right, let me know if I messed it up somehow.