Working on creating a meeting
Merge branch 'master' of github.com:tjsavage/planit

Conflicts:
	planit/scheduling/urls.py
	planit/scheduling/views.py