Changed the new file name and got rid of the extension.
Merge branch 'master' of https://github.com/clintonpearce/Training.git
Refactor code and resolved merge conflicts.