Merge branch 'ui'
more html and css
fixed merge conflicts
design stuff
things and stuff
im running out of commit messages
Merge branch 'master' into ui
fixed issue with top/bottom captions
styling complete