more comments
comments
Merge branch 'master' of ssh://github.com/pineauk/UPEI-Planner

Conflicts:
	UPEI Planner/AddAssignmentController.h
	UPEI Planner/AssignDetailsController.m
	UPEI Planner/AssignmentsViewController.h
	UPEI Planner/AssignmentsViewController.m
	UPEI Planner/CoursesViewController.h
	UPEI Planner/CoursesViewController.m
	UPEI Planner/InformationViewController.m