icons added
trying to merge with master.  ***Might break****
Merge pull request #18 from bchiatt/matt

Matt