Merge pull request #1 from rohan2817/master

my pull
linking system
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/Db.class.php
	index.php
Merge pull request #2 from chinmaygit/master

current