Commit test.java
Merge branch 'master' of https://github.com/fluke4/CS246