work on styling
Merge branch 'master' into john
Merge pull request #40 from stcrestrada/master

Estrada merge
added styling and fontawesome to links
merge master
integrate search bar into styling
Merge pull request #41 from woolly-bear-caterpillars-2014/john

John
ppull upstreams