diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 576d5d5..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 8269117..70e6ce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
# https://git-scm.com/docs/gitignore
# https://help.github.com/articles/ignoring-files
# Example .gitignore files: https://github.com/github/gitignore
/bower_components/
/node_modules/
+=======
+# https://git-scm.com/docs/gitignore
+# https://help.github.com/articles/ignoring-files
+# Example .gitignore files: https://github.com/github/gitignore
+/bower_components/
+/node_modules/
+>>>>>>> ok
diff --git a/Wello/src/css/hello[Conflict].css b/Wello/src/css/hello[Conflict].css
new file mode 100644
index 0000000..9399384
--- /dev/null
+++ b/Wello/src/css/hello[Conflict].css
@@ -0,0 +1,179 @@
+.hello {
+ position: absolute;
+ top: 20px;
+ right: 0;
+ bottom: 0;
+ left: 0;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Date Completed:
+
Insert date completed here
+
+ Permit Number:
+
Insert Permit Number here
+
+
State Well Number:
+
Insert well number here
+
Signature
+
Name of the person here
+
+
+
Owner
+
University of Connecticut
+
Location
+
Mansfield CT
+
+
+
+
Date of Report:
+
Insert that here
+
+
Registrant Number:
+
Insert that here
+
Other number:
+
Insert that here:
+
+
+
+Location Relative To Landmarks
+ Insert description here
+
+
+
+
Use :
+
where to use
+
+
+
Drilling Equipment:
+
Write what equipment was used
+
Casing details
+
+ Length: insert length here
+ Diameter: insert here
+ Weight per foot: insert here
+ Drive Shoe: insert here
+ Threaded: insert here
+ Was Casing Grouted: insert here
+
+ Yeild Test
+
+ Methods: insert here
+ Duration: insert here
+ Yield: insert here
+
+Write down the yeild here with same format as above
+
+
+ Water Level
+
+ From Land to Surface: insert here
+ During Yeild Test: insert here
+ Depth of Completed Well: insert here
+
+
+ Screen Details
+
+ Make: insert here
+ Length Open To Aquilfier: insert here
+ Slot Size: insert here
+ Diameter: insert here
+ Gravel: insert here
+ Diameter Including Gravel Pack: insert here
+ Gravel Size: insert here
+ Gravel Pack Location: insert here
+
+ Depth from land to surface
+
+ We must find a way to iterate based on the value in the submit form
+
+
+
+
+
+
+
+
+
+
+
+.hello .button-say-hello {
+ position: absolute;
+ display: block;
+ font-size: 120%;
+ bottom: 100px;
+ right: 50%;
+ -webkit-transform: translate(50%,0);
+ transform: translate(50%,0);
+ -webkit-appearance: none;
+ border-radius: 2px;
+ background: #efefef;
+ color: #666666;
+ padding: 10px;
+ width: 300px;
+ text-align: center;
+ text-decoration: none;
+ box-shadow: 0 3px 3px rgba(0, 0, 0, 0.1);
+}
+
+.hello .button-say-hello.Tappable-active {
+ background: #e6e6e6;
+ color: #333333;
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+ -webkit-transform: translate(50%, 1px);
+ transform: translate(50%, 1px);
+}
diff --git a/details.css b/details.css
index 670c7e3..993f1fe 100644
--- a/details.css
+++ b/details.css
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
body{
style = height: 2500px;
background-color: darkgray;
}
+=======
+body{
+ style = height: 2500px;
+ background-color: darkgray;
+}
+
+>>>>>>> ok
diff --git a/details.html b/details.html
index 4eae1d9..a870a3d 100644
--- a/details.html
+++ b/details.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
@@ -141,3 +142,148 @@ Write down the yeild here with same format as above