default page added
Merge branch 'ui3'
layout fixed
ui almost done
Merge branch 'ui4'
Merge branch 'master' of https://github.com/CXCS130-Fall-2014/cxcatalogapi