Now compatible with Java 6
Merge branch 'master' of github.com:ndm25/EECS314