Merge branch 'dev' of https://github.com/jh8579/fileshell_cloudcomputing into dev

# Conflicts:
#	fileshell/models.py
#	fileshell/settings.py
#	fileshell/urls.py
#	fileshell/views.py
#	templates/base.html

 body {
 body {
   font-family: "Roboto", sans-serif;
   font-family: "Roboto", sans-serif;
+  height :2000px
 }
 }
 ::placeholder{
 ::placeholder{
   color : #FFFFFF;
   color : #FFFFFF;
@@ -74,7 +75,7 @@ body {
 .left_bar {
 .left_bar {
   float:left;
   float:left;
   width:200px;
   width:200px;
-  height:1500px;
+  height:100%;
   background-color: #2b2d3d;
   background-color: #2b2d3d;
 }
 }
 .nav {
 .nav {