trial
Merge branch 'master' of github.com:swati259216/hello

Conflicts:
	app/controllers/hello2.java
check branch 1
Revert "check branch 1"

This reverts commit 6d49cffc0ab816f2a2274660ec4b453367403513.
helllll