Commit Update
Merge branch 'kguischard13-master'

Conflicts:
	classroom/classroom/CommentViewController.h
	classroom/classroom/CommentViewController.m
Merge branch 'master' of https://github.com/Caf131/com-virtual-app-ios

Conflicts:
	classroom/classroom/CommentViewController.h
	classroom/classroom/CommentViewController.m