samantha changes
updated for merge
fixed route confliects
pulled down changes
finished content-viewing on learner side
merged with Rachel's changes