Merge branch 'newman' of https://github.com/jr-news/cop5339.git into
newman
Merge remote-tracking branch 'origin/master' into newman
Merge branch 'newman' of https://github.com/jr-news/cop5339