now working for 4 hours before
Merge branch 'master' of https://github.com/Haverford-FIG/haverapp_django