Merge branch 'master' of github.com:finalsclubdev/FinalsClub
authorchapel <jacob.chapel@gmail.com>
Sun, 20 Nov 2011 03:57:39 +0000 (19:57 -0800)
committerchapel <jacob.chapel@gmail.com>
Sun, 20 Nov 2011 03:57:39 +0000 (19:57 -0800)
commiteee5213cc468c5db2166a6b91866589c531039bf
treef855f6224051d5123aeee47cd7a798521d9cf7e1
parent20ea68c2c8e89387911ef9cfa282d09f5b704d35
parent05800027b1bc4a74b6f4c567b87150d97c75ce73
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
public/index.html
public/javascripts/main.js