Update .gitignore
merge
use gunicorn
use celery
use celery
fix celery
Merge branch 'master' of heroku.com:polar-peak-4712

Conflicts:
	dormsite/settings.py
schedule app started
ignore temp files
add expenses,dinner and userdetails
add expenses,dinner and userdetails
Merge branch 'master' of github.com:Ibb41-4/dormsite
serve static files
code dump
serve static
serve static even when not logged in
upgrade to django 1.5 wo we can use the new user model
permissions
fixes for local development
add change own details form