comment by Aditya
Merge branch 'master' of https://github.com/adityaku/test

Conflicts:
	widget/clockWidget.js