Commit
Merge branch 'master' of https://github.com/Vibhu123/firstrepo
Commit
Conflicts:
	Symfony/src/Acme/StoreBundle/Controller/DefaultController.php