Merge remote-tracking branch 'origin/master'

Conflicts:
	Web.config

Signed-off-by: wasipeer <bitf11a045@pucit.edu.pk>
Merge branch 'master' of https://github.com/wasipeer/my_code