Merged the two smilie arrays that represent smilie text and the icon style, into a single array.
Added new 'angry' smilie (:@)
Merge branch 'master' of https://github.com/brentnewbury/Smaprat.git