d
Merge branch 'master' of https://github.com/Lauricio/ion-meteor

Conflicts:
	client/client.js