first commit
Merge https://github.com/nathandunn97/SchoolAdvisor
first commit -- needed merge