Committing latest as my laptop is dying a slow death. [FIX THIS COMMIT]
Merge branch 'master' of https://github.com/CodingBadgers/Perks