Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub 16/head
authorSeth Woodworth <seth@sethish.com>
Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)
committerSeth Woodworth <seth@sethish.com>
Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)
commitb96ea8865f681f85180e623863592814918ba49a
tree56a791c45da50143059bdccf9d867424218662c9
parent40bc9a70884b98d6d3a70c03fce88de9a5b43e01
parent92d94c3d3f33996a2aaf40ef3a449725f90f95c0
Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub

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