Merge branch 'master' of bitbucket.org:benbeltran/n-s-o-vocal

Conflicts:
	jekyll/about.html
	jekyll/projects.html

diff --git a/jekyll/_posts/2012-09-25-hola-mundo.md b/jekyll/_posts/2012-09-25-hola-mundo.md
index 37b1a4bed5321d19649d0bb1ca7ba467521fd599..ef370a5472bfaf8cb4f338fe94462670cf9e79e4 100644 (file)
--- a/jekyll/_posts/2012-09-25-hola-mundo.md
+++ b/jekyll/_posts/2012-09-25-hola-mundo.md
@@ -32,6 +32,6 @@ algunos lugares donde pueden encontrarme.
 * [Email][email_address]
 * [Github][github_address]
 
-[twitter_address]: http://twitter.com/benbeltran
+[twitter_address]: http://twitter.com/pigeonfolk
 [email_address]: mailto:ben@nsovocal.com
-[github_address]: http://github.com
+[github_address]: http://github.com/rbdr

diff --git a/jekyll/_posts/2012-10-29-cuatro-tips-para-ser-un-buen-junkie-de-la-terminal.md b/jekyll/_posts/2012-10-29-cuatro-tips-para-ser-un-buen-junkie-de-la-terminal.md
index 46cc1eb3cde1df592d5f99802ebeb0248098d9f9..bdf4ea088f343e74d9f302e4518d4cf817d516df 100644 (file)
--- a/jekyll/_posts/2012-10-29-cuatro-tips-para-ser-un-buen-junkie-de-la-terminal.md
+++ b/jekyll/_posts/2012-10-29-cuatro-tips-para-ser-un-buen-junkie-de-la-terminal.md
@@ -81,6 +81,6 @@ Espero que haya sido de utilidad para esos junkies que estan buscando que más p
 [tmuxinator]: https://github.com/aziz/tmuxinator
 [dotfiles]: http://blog.smalleycreative.com/tutorials/using-git-and-github-to-manage-your-dotfiles/
 [oh-my-zsh]: https://github.com/robbyrussell/oh-my-zsh
-[twitter]: https://twitter.com/benbeltran
+[twitter]: https://twitter.com/pigeonfolk
 [mail]: mailto:ben@nsovocal.com
 [junkie-header]: /img/articles/junkie/junkie-header.png

diff --git a/jekyll/_posts/2012-10-31-seis-meses-despues-la-vida-sin-facebook.md b/jekyll/_posts/2012-10-31-seis-meses-despues-la-vida-sin-facebook.md
index 98a83b41655ee6aeef60b77c917833eaa7257a49..982daf29556f6f24e894b8d273303c51da9e4e82 100644 (file)
--- a/jekyll/_posts/2012-10-31-seis-meses-despues-la-vida-sin-facebook.md
+++ b/jekyll/_posts/2012-10-31-seis-meses-despues-la-vida-sin-facebook.md
@@ -32,5 +32,5 @@ No es mucha diferencia, hoy en día uso mucho twitter para comunicación más ca
 Si me extrañas en facebook, o más probablemente, si quieres regañarme por tomar la decisión de dejar facebook, entonces puedes encontrarme en [twitter][twitter] o en [google+ / jabber][jabber]
 
 [header]: /img/articles/facebook/facebook-header.png
-[twitter]: http://twitter.com/benbeltran
+[twitter]: http://twitter.com/pigeonfolk
 [jabber]: mailto:ben@nsovocal.com

diff --git a/jekyll/_posts/2013-03-12-introducing-lyricli.md b/jekyll/_posts/2013-03-12-introducing-lyricli.md
index 00954a916b78f2f795826988bc0f1cbb2fb614aa..d7845eac2bafa8bf279d94d26c9fb4896b832324 100644 (file)
--- a/jekyll/_posts/2013-03-12-introducing-lyricli.md
+++ b/jekyll/_posts/2013-03-12-introducing-lyricli.md
@@ -27,5 +27,5 @@ That's about it. I hope it's as useful to you as it has been to me. In my laptop
 
 Check out the code on [github][github] and [let me know what you think][twitter]. If you need a new source, feel free to let me know, if I have a way to I'll do my best to; or you can try creating one yourself. It's really easy, and you can check the included rdio and itunes files to check how it's done.
 
-[github]: http://github.com/benbeltran/lyricli
-[twitter]: http://twitter.com/benbeltran
+[github]: http://github.com/rbdr/lyricli
+[twitter]: http://twitter.com/pigeonfolk

diff --git a/jekyll/lyricli/index.md b/jekyll/lyricli/index.md
index 5dfec313c2cf0506ef1b6d8e7b37584cf4152f68..2af8fb579124ed4cd62bca8d62e02f9f5fc45eaa 100644 (file)
--- a/jekyll/lyricli/index.md
+++ b/jekyll/lyricli/index.md
@@ -29,5 +29,5 @@ That's about it. I hope it's as useful to you as it has been to me. In my laptop
 
 Check out the code on [github][github] and [let me know what you think][twitter]. If you need a new source, feel free to let me know, if I have a way to I'll do my best to; or you can try creating one yourself. It's really easy, and you can check the included rdio and itunes files to check how it's done.
 
-[github]: http://github.com/benbeltran/lyricli
-[twitter]: http://twitter.com/benbeltran
+[github]: http://github.com/rbdr/lyricli
+[twitter]: http://twitter.com/pigeonfolk