changed erb to html erb
styling wip
changing some styling
merging with master
search page about 80 percent done
fixed conflicts styled buttons
Merge pull request #29 from fiery-skippers-2014/styling

Styling