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.