Journal that I almost forgot about...
Merge branch 'master' of https://github.com/scottbolten/SWEN301