Merge pull request #14 from jr-news/master

Merge pull request #13 from jr-news/newman
Merge remote-tracking branch 'origin/master' into newman
Merge branch 'newman' of https://github.com/jr-news/cop5339.git into newman
Merge pull request #15 from jr-news/newman

Sync with master