Merge remote-tracking branch 'upstream/master' into fresh
Merge pull request #203 from KodeKracker/master

conflict merge
Merge pull request #204 from KodeKracker/master

merge sunny conflict
Merge remote-tracking branch 'upstream/master' into fresh
games addded and cord modified
Merge pull request #5 from sunnyLA4/fresh

games added
Merge pull request #205 from sunnyLA4/master

games added
conflict merge Merge branch 'master' of https://github.com/smvdu/Titiksha-website

Conflicts:
	index.php