From: chapel <jacob.chapel@gmail.com>
Date: Sun, 20 Nov 2011 03:57:39 +0000 (-0800)
Subject: Merge branch 'master' of github.com:finalsclubdev/FinalsClub
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eee5213cc468c5db2166a6b91866589c531039bf;p=oweals%2Ffinalsclub.git

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
---

eee5213cc468c5db2166a6b91866589c531039bf
diff --cc public/index.html
index 9900384,e6a2e71..08ea68e
--- a/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>