bad commit
Merge branch 'master' of github.com:dcsan/gyrohack

Conflicts:
	app/.meteor/packages