Merge branch 'devel' of github.com:finalsclubdev/FinalsClub into devel
authorSeth Woodworth <seth@sethish.com>
Sun, 22 Jan 2012 21:51:18 +0000 (16:51 -0500)
committerSeth Woodworth <seth@sethish.com>
Sun, 22 Jan 2012 21:51:18 +0000 (16:51 -0500)
commit1b3cf86090dbfb43a9805f1c6da1845e3212a9ab
treee17ab201a6d2b3cdcae23970fd26092c87d45723
parent83a1fa1c1ff269cf52fa87a57cb9971e772a10af
parent9724b2743f334a1fc3dfa35bbfb8d402f8266b03
Merge branch 'devel' of github.com:finalsclubdev/FinalsClub into devel

Conflicts:
public/index.html
public/index.html