jquery 2.1
Merge branch 'master' of https://github.com/ccx01/T-night

Conflicts:
	index.html