Added
Forum post
Merge branch 'master' of https://github.com/aongko/shamir

Conflicts:
	protected/modules/class/controllers/student/ForumController.php