Class Search Page
Merge pull request #26 from mhlas7/master

Class Search Page
Merge remote-tracking branch 'upstream/master'