Merge branch 'master' of H:\workspace\ITECH\RateMyCourse with conflicts.
up