Updated Friday
Merge branch 'master' of https://github.com/jmu303/epicfridaybot