Commit dhiraj changes 3
Merge branch 'master' of https://github.com/teammatrix32/laravel
test
Conflicts:
	app/views/hello.php