...
Merge branch 'master' of github.com:younishd/localhost

Conflicts:
	stuff/index.php