first commit
merging stuff
Merge https://github.com/isalteverything/testcode