Added all my code from the summer! Some of it still needs a bit of work
Merge pull request #2 from jthomson264/master

Added all my code from the summer. Some of it still needs a bit of work.