ssss
resolved conflict in new
poster in the works
Merge branch 'development' into forms
parallax
poster lookin good
poster lookin better
fixed huge bug that i hope mac doesnt catch... unless he reads this
fixes for angie
poster marquee updated
poster and footer fix... think thats it mac. lets do the damn thing
Merge remote-tracking branch 'origin/poster' into development
Merge remote-tracking branch 'origin/angie' into development
better time order on attendee form
fixed footer on a few pages
updated gemfile for newest sidekiq to avoid frozen workers
Merge branch 'master' into development