Commit 11-12
Merge branch 'master' of https://github.com/theMaster23/andornotxor