adding .dbsqlite to gitignore
Merge branch 'master' of github.com:LLisa717/Callaborate

merging
removing db
woops wrong sqlite
adding README
gitignore was still incorrect. Should work now
moved the static file folder; djangoized the static file imports in index.html; imported the Montserrant font locally (still not enough speed up); moved the js out of the index.html file; updated js to correctly handle form (no more jumping);
failed attempt to incorporate django-userena. Moving on to django-registration
configured django-registration-redux; Checkout the signup section on the landing page to see how it works; Began work on a custom registration backend that only reqiures UCB email address rather than email, user, and password; Imported default views for registration screens; Created a base.html that includes a simple header to be used with registration views.
added custom registration and registration compelte pages
removing some of the registration fields from the landing page signup
Merge branch 'dj-registration'

Merging master with the udpates that include support for user registration
removed merge conflicts