merged in changes from FE
touch ups
oh
Added search button.
Merge branch 'master' of https://github.com/atorres757/hackU
Merge pull request #2 from atorres757/master

Last changes before presentation