My first commit
Merge branch 'master' of https://github.com/icaroleen/codeninjas4
Pulled files from Github