Added in the doom emoticons.
Merge branch 'master' of https://github.com/angular-resource-sails/bunker
32e53b895d7216d96dfa4b8)

Conflicts:
	assets/app/emoticons.js
Member list border improvements.
Help, help! I'm being oppressed!
Merge pull request #9 from weegeekps/master

Doom Emoticons