Express works with Socket IO biatch
Ignore temp files
Merge branch 'master' of https://github.com/RepublicOfKids/SingAlongWithMe

Conflicts:
	views/layout.jade~