login system
conflict

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

Conflicts:
	index.php
Merge pull request #203 from KodeKracker/master

conflict merge