working in newsToWiki
Merge branch 'master' of https://github.com/lasutschinkow/lasutschinkow-cs123