Merge branch 'master' of https://github.com/Webklex/laravel-imap

Author: Webklex

CHANGELOG.md

@@ -51,8 +51,6 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 \Webklex\IMAP\Message
 \Webklex\IMAP\Folder
 
->>>>>>> add1a03fed0574f7a738b049b19e329896020c24
-
 ## [1.0.2.3] - 2017-03-09
 ### Added
 -Code commented

README.md

@@ -4,6 +4,7 @@
 [![Software License][ico-license]](LICENSE.md)
 [![Build Status][ico-travis]][link-travis]
 [![Total Downloads][ico-downloads]][link-downloads]
+[![Gittip][ico-gittip]][link-gittip]
 
 ## Install
 
@@ -217,10 +218,12 @@ The MIT License (MIT). Please see [License File](LICENSE.md) for more informatio
 [ico-scrutinizer]: https://img.shields.io/scrutinizer/coverage/g/Webklex/laravel-imap.svg?style=flat-square
 [ico-code-quality]: https://img.shields.io/scrutinizer/g/Webklex/laravel-imap.svg?style=flat-square
 [ico-downloads]: https://img.shields.io/packagist/dt/Webklex/laravel-imap.svg?style=flat-square
+[ico-gittip]: http://img.shields.io/gittip/webklex.svg
 
 [link-packagist]: https://packagist.org/packages/Webklex/laravel-imap
 [link-travis]: https://travis-ci.org/Webklex/laravel-imap
 [link-scrutinizer]: https://scrutinizer-ci.com/g/Webklex/laravel-imap/code-structure
 [link-code-quality]: https://scrutinizer-ci.com/g/Webklex/laravel-imap
 [link-downloads]: https://packagist.org/packages/Webklex/laravel-imap
 [link-author]: https://github.com/webklex
+[link-gittip]: https://www.gittip.com/webklex