phase 3 complete

IDB3.log

@@ -1,3 +1,47 @@
+commit 5ddabc6f9c7d3d6ec67dc65fa8a52d18f56408bd
+Merge: b24aaa2 b5168b2
+Author: Vishnu Thiagarajan <thiagarajanvishnu@gmail.com>
+Date:   Thu Apr 20 22:49:55 2017 +0000
+
+    heckin merge conflict AAAAAAARGH
+
+commit b24aaa28f3d6d09bb4db3080338a615ed708419a
+Author: Vishnu Thiagarajan <thiagarajanvishnu@gmail.com>
+Date:   Thu Apr 20 22:46:06 2017 +0000
+
+    report cleanup if it is even possible, closes #103 for now
+
+commit b5168b24c9448638430eb31299cdd4f68ca74b69
+Author: adityapalnitkar <adityapalnitkar@gmail.com>
+Date:   Thu Apr 20 17:30:30 2017 -0500
+
+    Added more planit description
+
+commit bbd7f4f3c9b9a2c5e9a845a0b53b194804f747a9
+Author: adityapalnitkar <adityapalnitkar@gmail.com>
+Date:   Thu Apr 20 17:29:11 2017 -0500
+
+    Update design.html
+
+commit 0fff521018c57b941a6df86a98fe0fd249ab0f69
+Merge: 2bed563 a9c85c8
+Author: Vishnu Thiagarajan <thiagarajanvishnu@gmail.com>
+Date:   Thu Apr 20 22:18:18 2017 +0000
+
+    Merge branch 'master' of https://github.com/sweatshoptech/idb
+
+commit 2bed5630cf6dab61c30630bbfe7a88c64b117937
+Author: Vishnu Thiagarajan <thiagarajanvishnu@gmail.com>
+Date:   Thu Apr 20 22:18:11 2017 +0000
+
+    documentation check just in case
+
+commit a9c85c86cc4a181cb9d6e0bf1955e7661e535c82
+Author: adityapalnitkar <adityapalnitkar@gmail.com>
+Date:   Thu Apr 20 16:59:44 2017 -0500
+
+    Update design.html
+
 commit f5bc56780f9aa439dc2be72db8fb1caa090401b7
 Author: Vishnu Thiagarajan <thiagarajanvishnu@gmail.com>
 Date:   Thu Apr 20 21:59:17 2017 +0000

templates/about.html

@@ -55,7 +55,7 @@
             <h1 class="cover-heading" style="color: white;">What we’ve done</h1>
             <div class="member">
               <div class="member-info">
-                <member-header>Total commits : 528<br /><br /></member-header>
+                <member-header>Total commits : 533<br /><br /></member-header>
                 <member-header>Total issues : 103<br /><br /></member-header>
                 <member-header>Total unit tests : 20<br /><br /></member-header>
                 <member-header>Total additions : 10,651<br /><br /></member-header>
@@ -112,7 +112,7 @@ <h1 class="cover-heading">Who we are</h1>
                     <member-body> Hi, My name is Vishnu and I am a second year Computer Science major (classified as a Senior) at the University of Texas at Austin. I love food and doggo memes. <br /><br /></member-body>
                     <member-header> Major Responsibilities <br /><br /></member-header>
                     <member-body> Mostly the Flask backend, the SQLAlchemy Database, the API, the Hosting/DB Setup, and some front-end <br /><br /></member-body>
-                    <member-header>commits : 186 <br /><br /></member-header>
+                    <member-header>commits : 191 <br /><br /></member-header>
                     <member-header>issues : 74<br /><br /></member-header>
                     <member-header>unit tests : 5</member-header>
                   </div>
@@ -136,7 +136,7 @@ <h1 class="cover-heading">Who we are</h1>
                   <member-body> Hi! My name is Aditya, and I am a Junior Computer Science major at UT. I'm a huge aviation geek and I'm currently working on my private pilot's license.  <br /><br /></member-body>
                   <member-header> Major Responsibilities <br /><br /></member-header>
                   <member-body> A bit of both front-end and back-end <br /><br /><br /><br /></member-body>
-                  <member-header>commits : 4<br /><br /></member-header>
+                  <member-header>commits : 7<br /><br /></member-header>
                   <member-header>issues : 10<br /><br /></member-header>
                   <member-header>unit tests : 15</member-header>
                 </div>

tests.out

@@ -1,6 +1,6 @@
 ....................
 ----------------------------------------------------------------------
-Ran 20 tests in 2.318s
+Ran 20 tests in 2.282s
 
 OK
 Name        Stmts   Miss Branch BrPart  Cover