Merge pull request #175 from jwendl/master

Fixing issues 170 and 168
Merge pull request #42 from Magenic/master

Merge from Master
#170, changed image dimensions from magic numbers to constants.
Merge pull request #177 from Bowman74/master

 #170, changed image dimensions from magic numbers to constants.
Merge pull request #7 from Magenic/master

Grabbing latest
committing before merge
Merge branch 'master' of https://github.com/jpeterson7755/Badge-Application
Committing Yammer Changes
Merge pull request #179 from jpeterson7755/master

Fixed issue with Yammer posts
Merge pull request #43 from Magenic/master

merge from main.
#183, Changed so that images are now required for badges.
Merge pull request #188 from Bowman74/master

#183, Changed so that images are now required for badges.
Merge pull request #47 from Magenic/master

Updating my local fork.