blah
Merge branch 'master' of https://github.com/Benzilla/LuckyStrings

Conflicts:
	searchApp/socket.js
Added more rooms and dropdown animation