Busted shit out.
Merge branch 'master' of https://github.com/bammons/Schedulize into bailey-making-model-forms

Conflicts:
	Schedulize/Schedulize/urls.py
	Schedulize/Schedulize/urls.pyc
	Schedulize/portal/admin.pyc
	Schedulize/portal/forms/__init__.py
	Schedulize/portal/forms/__init__.pyc
	Schedulize/portal/models/employee.py
	Schedulize/portal/models/employee.pyc
	Schedulize/portal/models/laptop.pyc
	Schedulize/portal/models/projector.pyc
	Schedulize/portal/models/resource.pyc
	Schedulize/portal/models/room.pyc
	Schedulize/portal/templates/base.html
	Schedulize/portal/views/__init__.py
Merge pull request #2 from bammons/bailey-making-model-forms

Bailey making model forms