initial commit
Merge branch 'master' of github.com:bkolowitz/infsci2560_java

initial commit