adding file upload
Merge branch 'master' of https://github.com/clarathomas/lodgical

Conflicts:
	lodgical/settings.py