Merge pull request #12 from lu16j/master

req
Merge pull request #13 from lu16j/master

colors are now nice and perfect
commented the code
Merge pull request #4 from michelleoj/master

req