-jar files remote
-merged now
-merged now
Merge branch 'master' of https://github.com/patkaromkar/IPL.git

Conflicts:
	IPL/src/com/ipl/satta/dao/impl/UserDAOImpl.java
-uncomment