things
merge

 Merge branch 'master' of https://github.com/shriyanevatia/worldcupofsexy

Conflicts:
	web.js