commit
merge
Merge branch 'master' of https://github.com/nuclearflames/WhatsHot

Conflicts:
	WhatsHot/MvcApplication1/Scripts/js.js