Updated the template

Login/out buttons on same row, moved down a little
Merge branch 'master' of https://github.com/acm-uiuc/tatt

Conflicts:
	server/main/tpl/base.html
Merge pull request #41 from billliu1992/master

Fixed up the base template.
updated models and admin interface
Merge pull request #42 from drew212/modelupdate

updated models and admin interface
Widening page content and giving the header a larger height
Merge branch 'master' of github.com:acm-uiuc/tatt into templates
add items page created, fixes #11
Merge pull request #44 from drew212/master

Add items page implemented