changes (not by tupac)
Merge branch 'master' of github.com:HacktheUniverse/vortex