trying to pull failed so commiting again
Merge branch 'master' of https://github.com/vamshi2544/NityaSolutions.git

Conflicts:
	src/com/nitya/FlyingTech/Demo/Client.java
	src/com/nitya/FlyingTech/Demo/Employee.java