more html and css
fixed merge conflicts
design stuff
things and stuff
im running out of commit messages
styling complete
Merge branch 'ui'
COMPLETE