upload file update, added empty view and controller end point
Merge branch 'master' of github.com:danielisler2/lms299 into develop
Merge github.com:mdipierro/lms299 into develop
drop databases
Merge branch 'master' of https://github.com/matus85/lms299

Conflicts:
	databases/c8b669d15150d7109e5f7ab36744a5b7_course.table
	databases/c8b669d15150d7109e5f7ab36744a5b7_course_section.table
	databases/c8b669d15150d7109e5f7ab36744a5b7_membership.table
"fixed errors in db1.py and dbcal.py"
Merge branch 'master' of https://github.com/matus85/lms299

Conflicts:
	models/db1.py
	models/dbcal.py
Resolve conflicts in db1.py and dbcal.py
Merge branch 'master' of https://github.com/matus85/lms299
Merge branch 'master' of https://github.com/matus85/lms299
Merge github.com:mdipierro/lms299 into develop
Added update and delete functionality.
Added update and delete functionality.
ignore idea files.
Merge branch 'master' of https://github.com/mdipierro/lms299 into curtis
Changes to course dropbox, started view submissions
Merge branch 'master' of https://github.com/matus85/lms299

Conflicts:
	models/dbcal.py
Merge branch 'weirsyc-master'
Changing name of dropbox controller; additions to view
reference fix