Filled in some blue prints for testing
Merge branch 'master' of github.com:salazarm/MeteorGamezar