ready
remove classpath
merge master and resolve conflict
forgot to press save
Merge pull request #8 from travisreed-wf/checkpoint1

Code for Checkpoint1
Merge pull request #2 from BlueText/master

Take in Travis's changes to my personal repo