Some changes
Merge branch 'master' of https://github.com/andersonmi/Project3.git
More stuff