Added two new files
Added main to Boxer.java, step 5
Changed a javadoc comment
Merge pull request #9 from alecharrell/master

Alec's lab05 submission