Fixing css
Merge branch 'master' of github.com:chrishsu2312/mockup
Added stuff