Fixing merge issues
Fixing merge issues

Moduleplanner/Moduleplanner.github.io,Moduleplanner/Moduleplanner.github.io,Moduleplanner/Moduleplanner.github.io,Huaraz2/Moduleplanner.github.io,alcarney/ModulePlannerJekyll,Huaraz2/Moduleplanner.github.io,alcarney/ModulePlannerJekyll,alcarney/ModulePlannerJekyll,Huaraz2/Moduleplanner.github.io