New commit 1
Merge branch 'master' of https://github.com/ashish-belokar/test

Conflicts:
	src/com/demo/Main.java