Merge branch 'develop' of github.com:ajaaleixo/laravel-phraseapp into…

… develop

README.md

@@ -1,11 +1,8 @@
-<<<<<<< Updated upstream
-# Laraval PhraseApp Package
-=======
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/5ff9a31f3a0f4b1c8c6683b88adf37c5)](https://www.codacy.com/app/ajaaleixo/laravel-phraseapp?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ajaaleixo/laravel-phraseapp&amp;utm_campaign=Badge_Grade)
+[![CircleCI](https://circleci.com/gh/ajaaleixo/laravel-phraseapp/tree/master.svg?style=svg)](https://circleci.com/gh/ajaaleixo/laravel-phraseapp/tree/master)
 [![Downloads](https://img.shields.io/packagist/dt/ajaaleixo/laravel-phraseapp)](https://packagist.org/packages/ajaaleixo/laravel-phraseapp)
 
 # Laravel PhraseApp Package
->>>>>>> Stashed changes
 Supports L5.4
 
 This package offers you a way of downloading translated keys from https://phraseapp.com.