fix merge
Merge branch 'master' of https://github.com/ianvilla/SkynetFinalReport
minor edits and fixed merge issues