adding footer, editing logo
Merge branch 'master' of https://github.com/bkadowaki/Uply
adding jumbotron, search bar, changing logo animation
Fixed static_pages index merge conflicts
adjusting for merge
merging
removed layout render from categories controller