styles kinda working
Merge remote-tracking branch 'origin/search_bar_test_for_real' into styling
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem into styling
getting the background image and forms where I want them
landing page pretty much done
Merge pull request #24 from fiery-skippers-2014/styling

Styling
fixed merge conflict