Merge branch 'alfonso-cabrera-patch-1'

free-programming-books-tr.md

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