Corrects formatting issues
Merge branch 'master' of github.com:XYZMedia/shortProject