fixes
s
xx
Merge branch 'master' of https://github.com/Chillspectra/1st-sem-Junior-web

Conflicts:
	Webpage Mockup/Controllers/register.php
	Webpage Mockup/Controllers/schedule.php
	Webpage Mockup/Controllers/social posting.php
	Webpage Mockup/Controllers/today.php