FIxed bug 7 and 6
Merge branch 'master' of github.com:pencilcheck/PvP