Merge remote-tracking branch 'origin/master'

correasebastian · correasebastian · commit 2016a6b851a1 · 2016-03-11T16:38:39.000-05:00
# Conflicts:
#	readme.md
diff --git a/readme.md b/readme.md
@@ -15,6 +15,10 @@ when you navigate from and to that view you can see the console;
 
 also you can perform some methods 
 
+<<<<<<< HEAD
 you can see when you ente on account tabs, i add a number on top of the list even if the view is cached
 
-thats is really usefull
+thats is really usefull
+=======
+you can see when you ente on account tabs, i add a number on top of the list 
+>>>>>>> origin/master
