Merge pull request #1 from acm-uiuc/master

Website index now loads
Merge pull request #1 from acm-uiuc/master

Pulling from master repo
Merge pull request #1 from acm-uiuc/master

a
Added bootstrap, python manage.py collectstatic and it should work
Merge pull request #2 from amhendr2/master

Added bootstrap
Added local_settings.py and moved everything to server folder.
readded settings.py (oops) and moved .gitignore to root
updated gitignore and added readme
added dependencies.txt
Merge pull request #3 from drew212/master

Moved files into server folder, updated gitignore and other files
Merge branch 'master' of git://github.com/eparsons/tatt
Merge pull request #2 from acm-uiuc/master

Pulling from master
Adding old codebase

Includes both server and android app code
Merge pull request #4 from eparsons/master

Added old codebase
Merge pull request #2 from acm-uiuc/master

A
Added a register page, it's ugly, and a an overhaul of the UI is about to be done, just thought I'd commit what I had before I tear everything up.
Merge branch 'master' of git://github.com/amhendr2/tatt
Merge branch 'master' of https://github.com/acm-uiuc/tatt
Trying to redo things in bootstrap
Merge pull request #3 from amhendr2/master

A