Fix coloring and others
Merge branch 'master' of github.com:Sigma-2014-Video-Rental-Store-Project/Workspace