added attributes
redone things
Merge branch 'master' of github.com:Goobyalus/Experimentation