Merge branch 'master' of github.com:finalsclubdev/FinalsClub

* 'master' of github.com:finalsclubdev/FinalsClub:
  jsnow. updating script permissions.
  styling fixes, login, removed donate temp
  jsnow.  updating script permissions

Conflicts:
	public/index.html

diff --cc public/index.html
index 99003840880148485366797db593b34cfb603bcb,e6a2e7112b8c1387fe03e839a3ac18d4548ea33c..08ea68ee25fe8ff8a1e573128102c6a5c48b1d91
--- 1/public/index.html
--- 2/public/index.html
+++ b/public/index.html
@@@ -34,13 -35,13 +35,13 @@@
                                                </nav>
                                                <nav id="main-nav" class="small">
                                                        <ul>
 -                                                              <li><a href="/schools" class="active"><em class="icon"></em>Courses</a></li>
 +                                                              <li id=course_link><a href="/schools" class="active"><em class="icon"></em>Courses</a></li>
                                                                <li><a href="http://blog.finalsclub.org"><em class="icon"></em>Blog</a></li>
 -                                                              <li><a href="/archive"><em class="icon"></em>Library</a></li>
 -                                                              <li><a href="/press"><em class="icon"></em>Press</a></li>
 +                                                              <li id=archive_link><a href="/archive"><em class="icon"></em>Library</a></li>
 +                                                              <li id=press_link><a href="/press"><em class="icon"></em>Press</a></li>
                                                                <li id=register_link><a href="/register"><em class="icon"></em>Register</a></li>
                                                                <li id=profile_link><a href="/profile"><em class="icon"></em>Profile</a></li>
-                                                               <li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li>
+                                                               <!-- li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li -->
                                                        </ul>
                                                </nav>
                                        </div>

diff --cc public/javascripts/main.js
Simple merge