Merge branch 'Integration-Releases'

Conflicts:
	AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
diff --git a/.project b/.project
new file mode 100644
index 0000000..d3542a3
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>LocalRepo</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+	</buildSpec>

+	<natures>

+	</natures>

+</projectDescription>

diff --git a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
index 1e1ad22..89f0fe3 100644
--- a/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
+++ b/AntExample1/WebContent/WEB-INF/jsp/userForm.jsp
@@ -10,10 +10,14 @@
 </head>
 <body>
 <<<<<<< HEAD
+<h1>Cognizant Technology  </h1>
+=======
+<<<<<<< HEAD
 <h1>Cognizant Test </h1>
 =======
 <h1>Cognizant Technology  Solution</h1>
 >>>>>>> 46b94971157004bc4e2b04087cbc98cdd0caf8ef
+>>>>>>> refs/heads/Integration-Releases
 <form:form method="POST" commandName="user">
 
 	<table>
@@ -62,4 +66,4 @@
 </form:form>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/AntExample1/build/classes/com/vaannila/domain/User.class b/AntExample1/build/classes/com/vaannila/domain/User.class
new file mode 100644
index 0000000..900ddf3
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/domain/User.class
Binary files differ
diff --git a/AntExample1/build/classes/com/vaannila/service/UserService.class b/AntExample1/build/classes/com/vaannila/service/UserService.class
new file mode 100644
index 0000000..f92aa4e
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/service/UserService.class
Binary files differ
diff --git a/AntExample1/build/classes/com/vaannila/service/UserServiceImpl.class b/AntExample1/build/classes/com/vaannila/service/UserServiceImpl.class
new file mode 100644
index 0000000..eb88901
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/service/UserServiceImpl.class
Binary files differ
diff --git a/AntExample1/build/classes/com/vaannila/web/UserController.class b/AntExample1/build/classes/com/vaannila/web/UserController.class
new file mode 100644
index 0000000..9b16ddb
--- /dev/null
+++ b/AntExample1/build/classes/com/vaannila/web/UserController.class
Binary files differ
diff --git a/AntExample1/dist/AntExample.war b/AntExample1/dist/AntExample.war
new file mode 100644
index 0000000..b9e22d8
--- /dev/null
+++ b/AntExample1/dist/AntExample.war
Binary files differ
diff --git a/readme.txt b/readme.txt
new file mode 100644
index 0000000..47a44d9
--- /dev/null
+++ b/readme.txt
@@ -0,0 +1 @@
+SURESH   
\ No newline at end of file