last minute debugging
Merge branch 'master' of https://github.com/ThaddeusANg/a100-app