Merge branch 'master' of https://github.com/byuifasoftware/fa_mobile_app

Conflicts:
www/byui_scholarship.html
www/contact.html
www/d-f.html
www/deadlines.html
www/doc_tracker.html
just do it