Merge pull request #20 from JamOORev/develop

Merging lots of stuff
Added Mega to the list

He requested Coffee Drinker
Fixed the styling issue for Mega
Merge pull request #1 from Mitchellbrine/master

Well, apparently there are no exceptions...
Merge pull request #22 from Mitchellbrine/develop

Apparently there are no exceptions