Merge pull request #5 from BlueText/master

Take in Andrew's pull request
Merge pull request #21 from travisreed-wf/octoberweek3

October Week 3
Merge pull request #6 from BlueText/master

pull in travis's changes for October week 3
Organize classes into packages.
Remove duplicate jar lib
Merge pull request #22 from aguibert/master

Update upstream with package structure
resolving merge conflicts