working on nyan space
Merge branch 'master' of github.com:salazarm/MeteorGamezar

Conflicts:
	blueprint.js