template improved
Merge branch 'master' of https://github.com/rajpushkar/Summer_Project

Conflicts:
	website/changed.php~
	website/map.php
	website/map.php~
	website/mod/update.php
	website/result.php
	website/result.php~