firt commit, basic system implemented
Merge branch 'master' of https://github.com/wingerjc/onedeefive