add initial js file
fixed merge conflicts
fixed merge conflicts 2
shell fix merge
merge master into gh-pages
merge master into gh-pages
fixing github sucking
enlarge icon on welcome screen
Course DJ -> CourseDJ
New background
clarify search box parameters

because I want people not to be confused so that they'll vote for us
this week