changed alot of stufff
Merge branch 'origin/master'vvvvv