Merge branch 'master' of https://github.com/GitHubMrWhy/courseReg

Conflicts:

courseReg.xcodeproj/project.xcworkspace/xcuserdata/lancy.xcuserdatad/Use
rInterfaceState.xcuserstate

courseReg.xcodeproj/xcuserdata/lancy.xcuserdatad/xcdebugger/Breakpoints_
v2.xcbkptlist
	courseReg/CourseListTableViewController.m
	courseReg/MainStoryboard.storyboard
	courseReg/TradeTableViewController.h
	courseReg/TradeTableViewController.m
final