Purva Version 1.1
Merge branch 'master' of
https://github.com/OnlineBanking1/Online-Banking-System.git

Conflicts:
	OnlineBanking/.classpath
	OnlineBanking/src/main/webapp/WEB-INF/banking-servlet.xml
Merge branch 'master' of https://github.com/OnlineBanking1/Online-Banking-System.git
Purva version 1.2
Merge branch 'master' of https://github.com/OnlineBanking1/Online-Banking-System.git
Merge branch 'master' of https://github.com/OnlineBanking1/Online-Banking-System.git
Final purva
Version 1.2
Version 1.2
Version 1.2
Merge branch 'master' of
https://github.com/OnlineBanking1/Online-Banking-System.git

Conflicts:
	OnlineBanking/src/main/java/com/banking/app/controller/CustomerController.java
	OnlineBanking/src/main/webapp/WEB-INF/spring/appServlet/banking-servlet.xml