Changed IllegalArgumentException to InvalidArgumentException. It was a typo.
Merge branch 'master' of https://github.com/rehfeldchris/cs160proj