My first commit
Merge pull request #6 from MHSProgrammingClub/EliotWaddell

My first commit