inital moya commit
Merge branch 'master' of https://github.com/josephxsxn/jury-rigged-ideas