Commite by Admin
new one chnage
yj
uktu
jjujj
commit 1155
Merge branch 'master' of https://github.com/karthik4adept/Testing.git

Conflicts:
	HelloEffects/src/com/karthik/sample/demo1/Main.java