purple
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added new widget
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/curly.html.erb