UI Changes Part 3
Merge branch 'master' of https://github.com/imshashank/The-Game-Of-Choices

Conflicts:
	ui/js/custom2.js