added some stuff
Merge branch 'master' of https://github.com/kimba161/testing.git