Merge branch '#62' into Prototype

Conflicts:
	index.html
	scripts/rhizicore.js

2 files changed, 11 insertions, 0 deletions

diff --git a/index.html b/index.html
index 01a20d36..02c510be 100644
--- a/index.html
+++ b/index.html
@@ -49,7 +49,11 @@
 
 
    <div id="suggestion" >
+<<<<<<< HEAD
        <form> <input id="textanalyser" size="70" placeholder="Type here to create a network:" onkeyup="expand(this);"/></form>
+=======
+       <form> <input id = "textanalyser" size= "70" placeholder = "Type here to create a network:" onkeyup = "expand(this);"/></form>
+>>>>>>> #62
     </div>
 
     <div class="typeselection">
diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js
index 0ac2f29a..d39471d1 100644
--- a/scripts/rhizicore.js
+++ b/scripts/rhizicore.js
@@ -1033,8 +1033,15 @@ function customSize(type) {
 }
 
 function expand(obj){
+<<<<<<< HEAD
     if (!obj.savesize) {
         obj.savesize = obj.size;
     }
     obj.size = Math.max(obj.savesize, obj.value.length);
+=======
+    if (!obj.savesize)
+        obj.savesize = obj.size;
+    obj.size = Math.max(obj.savesize,obj.value.length);
+
+>>>>>>> #62
 }