어제 고친것들
Merge branch 'master' of github.com:cathyleeu/Glouniv

Conflicts:
	apps/__init__.pyc
	apps/controllers.pyc
	apps/forms.pyc
	apps/models.pyc
	apps/settings.pyc