Merge pull request #2 from rbnacharya/master

req2
Merge branch 'master' of https://github.com/poudelpavan/yc
Merge branch 'master' of https://github.com/poudelpavan/yc into poudelpavan-master

Conflicts:
	nbproject/project.properties
	src/com/rpst/yc/client/logic/code/ClientInit.java
	src/com/rpst/yc/server/ui/Setup.java