login form now fixed
Merge pull request #26 from eparsons/master

Updated django
Merge branch 'master' of github.com:acm-uiuc/tatt into loginformbugfix
reverting Django to 1.4.5, 1.5 breaks crispy forms
Merge pull request #28 from drew212/master

Reverted Django version
Merge pull request #27 from drew212/loginformbugfix

Loginformbugfix
fixed error with registering same username
Beginning to decompose templates, added ability to logout
Merge pull request #29 from drew212/registerbug

fixed error with registering same username
Merge branch 'master' of github.com:acm-uiuc/tatt into templates
table setup, need to test with items
Removed js and css references to files that don't exist
Merge branch 'master' of github.com:acm-uiuc/tatt into templates
minor bug fix to registration
Merge pull request #30 from eparsons/templates

Initial decomposition of templates with logout functionality
Merge branch 'master' of github.com:acm-uiuc/tatt into itemspage
various updates to models, admin site, and items page
Added login modal to base.html, updated bootstrap and jquery, and preparing compass for css generation
added item form, removed s from model names, updated models
oops, accidentally added add_item view