updated files
Merge branch 'master' of https://github.com/lindseydi/Team23
Academic app changes