Merge remote-tracking branch 'upstream/master' into fresh
deleted files
Merge branch 'master' of https://github.com/smvdu/Titiksha-website into fresh
cord page moved up from contact
Merge pull request #3 from sunnyLA4/fresh

cord page moved up
Merge pull request #201 from sunnyLA4/master

cord page moved up
conflict

Merge branch 'master' of https://github.com/smvdu/Titiksha-website

Conflicts:
	index.php