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

 {% extends 'base.html'%}
 {% extends 'base.html'%}
 {% load staticfiles %}
 {% load staticfiles %}
 {% block content %}
 {% block content %}
-    <div class="frame">
+    <div class="frame_home">
         <!-- //header -->
         <!-- //header -->
         <div class="container">
         <div class="container">
             <!-- //nav -->
             <!-- //nav -->
@@ -9,7 +9,7 @@
                 <div class = "shiftleft">
                 <div class = "shiftleft">
                     <h2>즐겨찾기</h2>
                     <h2>즐겨찾기</h2>
                 </div>
                 </div>
-                <table id="hor-minimalist-b" width = 1000px>
+                <table id="hor-minimalist-b">
                     <thead>
                     <thead>
                     <tr>
                     <tr>
                         <td width=300><p>제목</p></td>
                         <td width=300><p>제목</p></td>
@@ -65,7 +65,7 @@
                                 {% else %}
                                 {% else %}
                                     <td width=100><a  href="/changeFavor/{{ fileRow.bucketPath }}/{{ fileRow.title }}" align=center><img class = 'star_icon' src= "{% static 'resources/gray_star.png' %}" width="50" height="50"/></a></td>
                                     <td width=100><a  href="/changeFavor/{{ fileRow.bucketPath }}/{{ fileRow.title }}" align=center><img class = 'star_icon' src= "{% static 'resources/gray_star.png' %}" width="50" height="50"/></a></td>
                                 {% endif %}
                                 {% endif %}
-                                <td width=100><p  href="">{{ fileRow.fileSize }}</p></td>
+                                <td width=100><p  href="">{{ fileRow.fileSize}}</p></td>
                                 <td width=100><a  href="/delete/{{ fileRow.bucketPath }}{{ fileRow.title }}//{{ fileRow.title }}//{{ fileRow.bucketPath }}" align=center><img class = 'trash_icon' src= "{% static 'resources/trashcan.png' %}" width="50" height="50"/></a></td>
                                 <td width=100><a  href="/delete/{{ fileRow.bucketPath }}{{ fileRow.title }}//{{ fileRow.title }}//{{ fileRow.bucketPath }}" align=center><img class = 'trash_icon' src= "{% static 'resources/trashcan.png' %}" width="50" height="50"/></a></td>
                             </tr>
                             </tr>
                         {% endfor %}
                         {% endfor %}