changes to stash
fixing merge conflict
changes to stash
Merge branch 'master' of github.com:AndrewMagliozzi/Admit
fixing some small issues
adding course schema and other small fixes