Merge pull request #68 from RioBus/dev

Merging with dev

Author: Fred Souza

README.md

@@ -61,21 +61,12 @@ Issues and PRs are welcome, see the [issues list](https://github.com/riobus/ioni
 
 ## Changelog
 
-<<<<<<< HEAD
 See the changelog [here](https://github.com/riobus/ionic/blob/master/CHANGELOG.md)
-=======
-See the changelog [here](https://github.com/fmsouza/ionic2-blank/blob/master/CHANGELOG.md)
->>>>>>> 741b8b099bde25b17ab828340d318d4a1b537bfc
 
 ## Main dependencies
 
-<<<<<<< HEAD
-* **@Angular:** 2.0.0-rc.3
-* **Ionic:** 2.0.0-beta.10
-=======
 * **@Angular:** 2.0.0-rc.4
 * **Ionic:** 2.0.0-beta.11
->>>>>>> 741b8b099bde25b17ab828340d318d4a1b537bfc
 
 External dependencies are listed here to justify their inclusion and to allow for their removal if your project isn't using the related functionality.