Removing .pyc from commit??
	deleted:    Blog.pyc
	deleted:    Calendar.pyc
	deleted:    Comment.pyc
	deleted:    Company.pyc
	deleted:    Database Test.pyc
	deleted:    Department.pyc
	deleted:    Event.pyc
	deleted:    File.pyc
	deleted:    Model.pyc
	deleted:    Person.pyc
	deleted:    Post.pyc
	deleted:    Project.pyc
	deleted:    Task.pyc
	deleted:    Title.pyc
	deleted:    User.pyc
	deleted:    Workspace.pyc
	deleted:    __init__.pyc
	deleted:    database_example.pyc
	deleted:    database_populate.pyc
	deleted:    model_testing.pyc
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration

Conflicts:
	cuorewebpage/Model/Calendar.pyc
	cuorewebpage/Model/Company.pyc
	cuorewebpage/Model/Department.pyc
	cuorewebpage/Model/File.pyc
	cuorewebpage/Model/User.pyc
	cuorewebpage/Model/database_populate.pyc
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration
drop down menu links, Registration action=edit becomes new view with new template inheriting layout_sidebar_default
Merge remote-tracking branch 'origin/Intranet_Registration' into Intranet_Registration