pull
Merge branch 'master' of https://github.com/quadloops/campsia-api

Conflicts:
	bill/admin.py
	bill/admin.pyc
	bill/models.py
	bill/models.pyc
	hostels/admin.py
	hostels/admin.pyc
	hostels/api.pyc
	hostels/models.pyc
	messbillcal/settings.py
	messbillcal/settings.pyc
	student/models.py
	student/models.pyc
created bill view
Merge remote-tracking branch 'origin/master'

Conflicts:
	messbillcal/__init__.pyc
	messbillcal/settings.pyc