test phase
Merge branch 'master' of https://github.com/crobytech/test_compete

New stuff, testing phase 1