removed alert
Merge branch 'master' of github.com:zhangela/desk-trainer

Conflicts:
	website/.meteor/packages