Merge branch 'master' of suun/Teknik into master

Teknik/Areas/User/Views/User/Index.cshtml

@@ -109,7 +109,7 @@
                     <li><a href="#about" data-toggle="tab"> About Myself </a></li>
                     <li><a href="#uploads" data-toggle="tab"> Uploads </a></li>
                     <li><a href="#pastes" data-toggle="tab"> Pastes </a></li>
-                    <li><a href="#shortenedUrls" data-toggle="tab"> Shotened Urls </a></li>
+                    <li><a href="#shortenedUrls" data-toggle="tab"> Shortened Urls </a></li>
                 </ul>
                 <div class="tab-content">
                     <div class="tab-pane active" id="about">
@@ -235,4 +235,4 @@
             </div>
         </div>
     }
-</div>
+</div>