rearranged some things
Merge branch 'master' of github.com:Zazcallabah/id2216