xx
Merge branch 'master' of https://github.com/steffow/nordvind

Conflicts:
	.meteor/packages
resolvig