commit
Merge github.com:joelunmsm2003/Monitor

Conflicts:
	Monitor/__init__.pyc
	Monitor/settings.py
	Monitor/settings.pyc
	MonitorApp/__init__.pyc
	MonitorApp/admin.pyc
	MonitorApp/models.pyc
	git