Added a large amount logic for calulating deadlines
Merge branch 'master' of https://github.com/DanielJCampbell/Thesis-Management