editing a little
working on things
Merge branch 'master' of http://github.com/Saurutobi/Team3.14