I hate javadocing
Merge branch 'master' of github.com:ghidalgo3/CS2340-such-android