merge conflict

Author: MarsVard

IconView/bin/classes/be/webelite/entypoview/R$id.class

@@ -1,6 +1,8 @@
 ## IconView
 
 IconView is an extension of Android TextView class which provides support for a custom icon font
+
+here's a screenshot of the simple example application included
 ![screenshot](https://raw.github.com/MarsVard/IconView/master/screenshot.png)
 
 ## Usage
@@ -54,4 +56,4 @@ the reason for not using the icofonts as supplied by ex. www.entypo.com is that
 
 * [Apache Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
 
-**Note that all fonts have their own license.**
+**Note that all fonts have their own license.**