2nd commit
Merge branch 'master' of https://github.com/thyagomota/CSCI261-codestyle-tool