FIXING MERGE CONFLICT
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Merge branch 'master' of https://github.com/KhalidRich/NSBEHairSOS
Did templating stuff for pages