basics
more basic layout stuff
Merge branch 'master' into featured
link updates
Merge pull request #98 from zsherman/featured

Featured