Set fall and spring difficulties upon uploading capp report
Merge branch 'master' of https://github.com/alexkau/YACP

Conflicts:
	planner/models.py
	planner/views.py