mc
mcMerge branch 'master' of https://github.com/amolc/yoopme

Conflicts:
	yoopmeapp.js