sup michelle
Merge branch 'master' of https://github.com/jackridderhof/Litmus

Conflicts:
	Litmus/InstructorViewController.m
	Litmus/StudentViewController.m