Merge branch 'patch-1' of...

Merge branch 'patch-1' of git://github.com/alfonso-cabrera/free-programming-books into alfonso-cabrera-patch-1

Conflicts:
	free-programming-books-tr.md

free-programming-books-tr.md

@@ -19,8 +19,10 @@
 * [R](#r)
 * [Ruby](#ruby)
 * [Rust](#rust)
+<<<<<<< HEAD
 * [Swift](#swift)
 * [Windows Phone](#windowsphone)
+=======
 
 
 ### Android