jubclub landing
erics club
merged connie, eric, and themef (mike)
Merge branch 'master' of ssh://jubclub-agee.rhcloud.com/~/git/jubclub
changes 2
refreshed files
refreshed files2
added index again
commited
ffd
try again
merged
added empty index
actual index
kept git copied new folder
fixing the span in trending
took mikes index.html and process.php
took mikes css
made a very small change to a comment
Merge branch 'mikenew'