updated version
Merge branch 'master' of https://github.com/rehfeldchris/cs160proj

Conflicts:
	ShowTrendingKeywords.php
	TrendingCourses.php