Merge branch 'master' of https://github.com/ut-cs378-vision-2014fall/course-info