fix typo in Java tutorial

37 files changed, 8890 insertions, 581 deletions

diff --git a/README.markdown b/README.markdown
index efc2fa07..701b12d7 100644
--- a/README.markdown
+++ b/README.markdown
@@ -9,18 +9,47 @@ commented code and explained as they go.
 ... to write more inline code tutorials. Just grab an existing file from
 this repo and copy the formatting (don't worry, it's all very simple).
 Make a new file, send a pull request, and if it passes muster I'll get it up pronto.
-Remember to fill in the author and author\_url fields so you get credited
+Remember to fill in the "contributors" fields so you get credited
 properly!
 
 ### Requests
 
-The most requested languages are:
+We've had a ton of interest, b
 
-* Go
-* ~~Scala~~
-* ~~Javascript~~
+### Contributing
 
-... but there are many more requests to do "every language", so don't let that stop you.
+All contributions welcome, from the tiniest typo to a brand new article. Translations
+in all languages are welcome (or, for that matter, original articles in any language).
+
+#### Style Guidelines
+
+* Try to keep **line length in code blocks to 80 characters or fewer**, or they'll overflow
+  and look odd.
+
+* Try to use as few words as possible. Code examples are preferred over exposition in all cases.
+
+* We welcome newcomers, but the target audience for this site is programmers with some experience.
+  So, try to avoid explaining basic concepts except for those specific to the language in question,
+  to keep articles succinct and scannable. We all know how to use google here.
+
+* For translations (or english articles with non-ASCII characters), please make sure your file is
+  utf-8 encoded.
+
+#### Header configuration
+
+The actual site uses Middleman to generate HTML files from these markdown ones. Middleman, or at least
+the custom scripts underpinning the site, required that some key information be defined in the header.
+
+The following fields are necessary for english articles about programming languages:
+
+* **language** The *programming language* in question
+* **contributors** A list of [author, url] lists to credit
+
+Other fields:
+
+* **filename**: The filename for this article's code. It will be fetched, mashed together, and made downloadable.
+  For non-english articles, *filename* should have a language-specific suffix.
+* **lang**: For translations, the human language this article is in. For categorization, mostly.
 
 ## License
 
diff --git a/bash.html.markdown b/bash.html.markdown
new file mode 100644
index 00000000..7421f880
--- /dev/null
+++ b/bash.html.markdown
@@ -0,0 +1,93 @@
+---
+
+category: tool
+tool: bash
+contributors:
+    - ["Max Yankov", "https://github.com/golergka"]
+    - ["Darren Lin", "https://github.com/CogBear"]
+filename: LearnBash.sh
+
+---
+
+Bash is a name of the unix shell, which was also distributed as the shell for the GNU operating system and as default shell on Linux and Mac OS X.
+Nearly all examples below can be a part of a shell script or executed directly in the shell.
+
+[Read more here.](http://www.gnu.org/software/bash/manual/bashref.html)
+
+```bash
+#!/bin/sh
+# First line of the script is shebang which tells the system how to execute
+# the script: http://en.wikipedia.org/wiki/Shebang_(Unix)
+# As you already figured, comments start with #. Shebang is also a comment.
+
+# Simple hello world example:
+echo Hello, world!
+
+# Each command starts on a new line, or after semicolon:
+echo 'This is the first line'; echo 'This is the second line'
+
+# Declaring a variable looks like this:
+VARIABLE="Some string"
+
+# But not like this:
+VARIABLE = "Some string"
+# Bash will decide that VARIABLE is a command it must execute and give an error
+# because it couldn't be found.
+
+# Using the variable:
+echo $VARIABLE
+echo "$VARIABLE"
+# When you use the variable itself — assign it, export it, or else — you write
+# its name without $. If you want to use variable's value, you should use $.
+
+# Reading a value from input:
+echo "What's your name?"
+read NAME # Note that we didn't need to declare new variable
+echo Hello, $NAME!
+
+# We have the usual if structure:
+if true
+then
+    echo "This is expected"
+else
+    echo "And this is not"
+fi
+
+# Expressions are denoted with the following format:
+echo $(( 10 + 5 ))
+
+# Unlike other programming languages, bash is a shell — so it works in a context
+# of current directory. You can list files and directories in the current
+# directories with ls command:
+ls
+
+# These commands have options that control their execution:
+ls -l # Lists every file and directory on a separate line
+
+# Results of the previous command can be passed to the next command as input.
+# grep command filters the input with provided patterns. That's how we can list
+# txt files in the current directory:
+ls -l | grep "\.txt"
+
+# Commands can be substitued within other commands using $( ):
+# The following command displays the number of files and directories in the
+# current directory.
+echo "There are $(ls | wc -l) items here."
+
+# Bash uses a case statement that works similarily to switch in Java and C++:
+case "$VARIABLE"
+in
+    #List patterns for the conditions you want to meet
+    0) echo "There is a zero."
+    1) echo "There is a one."
+    *) echo "It is not null."
+esac
+
+#For loops iterate for as many arguments given:
+#The contents of var $VARIABLE is printed three times.
+for $VARIABLE in x y z
+do
+    echo "$VARIABLE"
+done
+
+```
diff --git a/c.html.markdown b/c.html.markdown
index d243b19d..24a96463 100644
--- a/c.html.markdown
+++ b/c.html.markdown
@@ -1,23 +1,23 @@
 ---
-name: c
-category: language
 language: c
 filename: learnc.c
 contributors:
     - ["Adam Bard", "http://adambard.com/"]
+    - ["Árpád Goretity", "http://twitter.com/H2CO3_iOS"]
+
 ---
 
-Ah, C. Still the language of modern high-performance computing.
+Ah, C. Still **the** language of modern high-performance computing.
 
 C is the lowest-level language most programmers will ever use, but
 it more than makes up for it with raw speed. Just be aware of its manual
 memory management and C will take you as far as you need to go.
 
 ```c
-// Single-line comments start with //
+// Single-line comments start with // - only available in C99 and later.
 
 /*
-Multi-line comments look like this.
+Multi-line comments look like this. They work in C89 as well.
 */
 
 // Import headers with #include
@@ -25,6 +25,10 @@ Multi-line comments look like this.
 #include <stdio.h>
 #include <string.h>
 
+// (File names between <angle brackets> are headers from the C standard library.)
+// For your own headers, use double quotes instead of angle brackets:
+#include "my_header.h"
+
 // Declare function signatures in advance in a .h file, or at the top of
 // your .c file.
 void function_1();
@@ -33,261 +37,337 @@ void function_2();
 // Your program's entry point is a function called
 // main with an integer return type.
 int main() {
+    // print output using printf, for "print formatted"
+    // %d is an integer, \n is a newline
+    printf("%d\n", 0); // => Prints 0
+    // All statements must end with a semicolon
+
+    ///////////////////////////////////////
+    // Types
+    ///////////////////////////////////////
+
+    // ints are usually 4 bytes 
+    int x_int = 0;
+
+    // shorts are usually 2 bytes
+    short x_short = 0;
 
-// print output using printf, for "print formatted"
-// %d is an integer, \n is a newline
-printf("%d\n", 0); // => Prints 0
-// All statements must end with a semicolon
-
-///////////////////////////////////////
-// Types
-///////////////////////////////////////
-
-// You have to declare variables before using them. A variable declaration
-// requires you to specify its type; a variable's type determines its size
-// in bytes.
-
-// ints are usually 4 bytes 
-int x_int = 0;
-
-// shorts are usually 2 bytes
-short x_short = 0;
-
-// chars are guaranteed to be 1 byte
-char x_char = 0;
-char y_char = 'y'; // Char literals are quoted with ''
-
-// longs are often 4 to 8 bytes; long longs are guaranteed to be at least
-// 64 bits
-long x_long = 0;
-long long x_long_long = 0; 
-
-// floats are usually 32-bit floating point numbers
-float x_float = 0.0;
-
-// doubles are usually 64-bit floating-point numbers
-double x_double = 0.0;
-
-// Integral types may be unsigned. This means they can't be negative, but
-// the maximum value of an unsigned variable is greater than the maximum
-// signed value of the same size.
-unsigned char ux_char;
-unsigned short ux_short;
-unsigned int ux_int;
-unsigned long long ux_long_long;
-
-// Other than char, which is always 1 byte, these types vary in size depending
-// on your machine. sizeof(T) gives you the size of a variable with type T in 
-// bytes so you can express the size of these types in a portable way.
-// For example,
-printf("%lu\n", sizeof(int)); // => 4 (on machines with 4-byte words)
-
-// Arrays must be initialized with a concrete size.
-char my_char_array[20]; // This array occupies 1 * 20 = 20 bytes
-int my_int_array[20]; // This array occupies 4 * 20 = 80 bytes
-                      // (assuming 4-byte words)
-
-
-// You can initialize an array to 0 thusly:
-char my_array[20] = {0};
-
-// Indexing an array is like other languages -- or,
-// rather, other languages are like C
-my_array[0]; // => 0
-
-// Arrays are mutable; it's just memory!
-my_array[1] = 2;
-printf("%d\n", my_array[1]); // => 2
-
-// Strings are just arrays of chars terminated by a NUL (0x00) byte,
-// represented in strings as the special character '\0'.
-// (We don't have to include the NUL byte in string literals; the compiler
-//  inserts it at the end of the array for us.)
-char a_string[20] = "This is a string";
-printf("%s\n", a_string); // %s formats a string
-
-/*
-You may have noticed that a_string is only 16 chars long.
-Char #17 is the NUL byte. 
-Chars #18, 19 and 20 have undefined values.
-*/
-
-printf("%d\n", a_string[16]); // => 0
-
-///////////////////////////////////////
-// Operators
-///////////////////////////////////////
-
-int i1 = 1, i2 = 2; // Shorthand for multiple declaration
-float f1 = 1.0, f2 = 2.0;
-
-// Arithmetic is straightforward
-i1 + i2; // => 3
-i2 - i1; // => 1
-i2 * i1; // => 2
-i1 / i2; // => 0 (0.5, but truncated towards 0)
-
-f1 / f2; // => 0.5, plus or minus epsilon
-
-// Modulo is there as well
-11 % 3; // => 2
-
-// Comparison operators are probably familiar, but
-// there is no boolean type in c. We use ints instead.
-// 0 is false, anything else is true. (The comparison 
-// operators always return 0 or 1.)
-3 == 2; // => 0 (false)
-3 != 2; // => 1 (true)
-3 > 2; // => 1
-3 < 2; // => 0
-2 <= 2; // => 1
-2 >= 2; // => 1
-
-// Logic works on ints
-!3; // => 0 (Logical not)
-!0; // => 1
-1 && 1; // => 1 (Logical and)
-0 && 1; // => 0
-0 || 1; // => 1 (Logical or)
-0 || 0; // => 0
-
-// Bitwise operators!
-~0x0F; // => 0xF0 (bitwise negation)
-0x0F & 0xF0; // => 0x00 (bitwise AND)
-0x0F | 0xF0; // => 0xFF (bitwise OR)
-0x04 ^ 0x0F; // => 0x0B (bitwise XOR)
-0x01 << 1; // => 0x02 (bitwise left shift (by 1))
-0x02 >> 1; // => 0x01 (bitwise right shift (by 1))
-
-///////////////////////////////////////
-// Control Structures
-///////////////////////////////////////
-
-if (0) {
-  printf("I am never run\n");
-} else if (0) {
-  printf("I am also never run\n");
-} else {
-  printf("I print\n");
-}
-
-// While loops exist
-int ii = 0;
-while (ii < 10) {
-    printf("%d, ", ii++); // ii++ increments ii in-place, after using its value.
-} // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
-
-printf("\n");
-
-int kk = 0;
-do {
-    printf("%d, ", kk);
-} while (++kk < 10); // ++kk increments kk in-place, before using its value
-// => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
-
-printf("\n");
-
-// For loops too
-int jj;
-for (jj=0; jj < 10; jj++) {
-    printf("%d, ", jj);
-} // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
-
-printf("\n");
-
-///////////////////////////////////////
-// Typecasting
-///////////////////////////////////////
-
-// Every value in C has a type, but you can cast one value into another type
-// if you want.
-
-int x_hex = 0x01; // You can assign vars with hex literals
-
-// Casting between types will attempt to preserve their numeric values
-printf("%d\n", x_hex); // => Prints 1
-printf("%d\n", (short) x_hex); // => Prints 1
-printf("%d\n", (char) x_hex); // => Prints 1
-
-// Types will overflow without warning
-printf("%d\n", (char) 257); // => 1 (Max char = 255)
-
-// Integral types can be cast to floating-point types, and vice-versa.
-printf("%f\n", (float)100); // %f formats a float
-printf("%lf\n", (double)100); // %lf formats a double
-printf("%d\n", (char)100.0);
-
-///////////////////////////////////////
-// Pointers
-///////////////////////////////////////
+    // chars are guaranteed to be 1 byte
+    char x_char = 0;
+    char y_char = 'y'; // Char literals are quoted with ''
+
+    // longs are often 4 to 8 bytes; long longs are guaranteed to be at least
+    // 64 bits
+    long x_long = 0;
+    long long x_long_long = 0; 
+
+    // floats are usually 32-bit floating point numbers
+    float x_float = 0.0;
+
+    // doubles are usually 64-bit floating-point numbers
+    double x_double = 0.0;
+
+    // Integral types may be unsigned.
+    unsigned short ux_short;
+    unsigned int ux_int;
+    unsigned long long ux_long_long;
+
+    // sizeof(T) gives you the size of a variable with type T in bytes
+    // sizeof(obj) yields the size of the expression (variable, literal, etc.).
+    printf("%zu\n", sizeof(int)); // => 4 (on most machines with 4-byte words)
+
+
+    // If the argument of the `sizeof` operator an expression, then its argument
+    // is not evaluated (except VLAs (see below)).
+    // The value it yields in this case is a compile-time constant.
+    int a = 1;
+    size_t size = sizeof(a++); // a++ is not evaluated
+    printf("sizeof(a++) = %zu where a = %d\n", size, a);
+    // prints "sizeof(a++) = 4 where a = 1" (on a 32-bit architecture)
+
+    // Arrays must be initialized with a concrete size.
+    char my_char_array[20]; // This array occupies 1 * 20 = 20 bytes
+    int my_int_array[20]; // This array occupies 4 * 20 = 80 bytes
+                          // (assuming 4-byte words)
+
+
+    // You can initialize an array to 0 thusly:
+    char my_array[20] = {0};
+
+    // Indexing an array is like other languages -- or,
+    // rather, other languages are like C
+    my_array[0]; // => 0
+
+    // Arrays are mutable; it's just memory!
+    my_array[1] = 2;
+    printf("%d\n", my_array[1]); // => 2
+
+    // In C99 (and as an optional feature in C11), variable-length arrays (VLAs)
+    // can be declared as well. The size of such an array need not be a compile
+    // time constant:
+    printf("Enter the array size: "); // ask the user for an array size
+    char buf[0x100];
+    fgets(buf, sizeof buf, stdin);
+
+    // strtoul parses a string to an unsigned integer
+    size_t size = strtoul(buf, NULL, 10);
+    int var_length_array[size]; // declare the VLA
+    printf("sizeof array = %zu\n", sizeof var_length_array);
+
+    // A possible outcome of this program may be:
+    // > Enter the array size: 10
+    // > sizeof array = 40
+
+    // Strings are just arrays of chars terminated by a NUL (0x00) byte,
+    // represented in strings as the special character '\0'.
+    // (We don't have to include the NUL byte in string literals; the compiler
+    //  inserts it at the end of the array for us.)
+    char a_string[20] = "This is a string";
+    printf("%s\n", a_string); // %s formats a string
+
+    printf("%d\n", a_string[16]); // => 0
+    // i.e., byte #17 is 0 (as are 18, 19, and 20)
+
+    // If we have characters between single quotes, that's a character literal.
+    // It's of type `int`, and *not* `char` (for historical reasons).
+    int cha = 'a'; // fine
+    char chb = 'a'; // fine too (implicit conversion from int to char)
+
+    ///////////////////////////////////////
+    // Operators
+    ///////////////////////////////////////
+
+    int i1 = 1, i2 = 2; // Shorthand for multiple declaration
+    float f1 = 1.0, f2 = 2.0;
+
+    // Arithmetic is straightforward
+    i1 + i2; // => 3
+    i2 - i1; // => 1
+    i2 * i1; // => 2
+    i1 / i2; // => 0 (0.5, but truncated towards 0)
+
+    f1 / f2; // => 0.5, plus or minus epsilon
+    // Floating-point numbers and calculations are not exact
+
+    // Modulo is there as well
+    11 % 3; // => 2
+
+    // Comparison operators are probably familiar, but
+    // there is no boolean type in c. We use ints instead.
+    // (Or _Bool or bool in C99.)
+    // 0 is false, anything else is true. (The comparison 
+    // operators always yield 0 or 1.)
+    3 == 2; // => 0 (false)
+    3 != 2; // => 1 (true)
+    3 > 2; // => 1
+    3 < 2; // => 0
+    2 <= 2; // => 1
+    2 >= 2; // => 1
+
+    // C is not Python - comparisons don't chain.
+    int a = 1;
+    // WRONG:
+    int between_0_and_2 = 0 < a < 2;
+    // Correct:
+    int between_0_and_2 = 0 < a && a < 2;
+
+    // Logic works on ints
+    !3; // => 0 (Logical not)
+    !0; // => 1
+    1 && 1; // => 1 (Logical and)
+    0 && 1; // => 0
+    0 || 1; // => 1 (Logical or)
+    0 || 0; // => 0
+
+    // Bitwise operators!
+    ~0x0F; // => 0xF0 (bitwise negation, "1's complement")
+    0x0F & 0xF0; // => 0x00 (bitwise AND)
+    0x0F | 0xF0; // => 0xFF (bitwise OR)
+    0x04 ^ 0x0F; // => 0x0B (bitwise XOR)
+    0x01 << 1; // => 0x02 (bitwise left shift (by 1))
+    0x02 >> 1; // => 0x01 (bitwise right shift (by 1))
+
+    // Be careful when shifting signed integers - the following are undefined:
+    // - shifting into the sign bit of a signed integer (int a = 1 << 32)
+    // - left-shifting a negative number (int a = -1 << 2)
+    // - shifting by an offset which is >= the width of the type of the LHS:
+    //   int a = 1 << 32; // UB if int is 32 bits wide
+
+    ///////////////////////////////////////
+    // Control Structures
+    ///////////////////////////////////////
+
+    if (0) {
+      printf("I am never run\n");
+    } else if (0) {
+      printf("I am also never run\n");
+    } else {
+      printf("I print\n");
+    }
 
-// A pointer is a variable declared to store a memory address. Its declaration will
-// also tell you the type of data it points to. You can retrieve the memory address 
-// of your variables, then mess with them.
-
-int x = 0;
-printf("%p\n", &x); // Use & to retrieve the address of a variable
-// (%p formats a pointer)
-// => Prints some address in memory;
-
-// Pointer types end with * in their declaration
-int* px; // px is a pointer to an int
-px = &x; // Stores the address of x in px
-printf("%p\n", px); // => Prints some address in memory
-
-// To retreive the value at the address a pointer is pointing to,
-// put * in front to de-reference it.
-printf("%d\n", *px); // => Prints 0, the value of x, which is what px is pointing to the address of
-
-// You can also change the value the pointer is pointing to.
-// We'll have to wrap the de-reference in parenthesis because
-// ++ has a higher precedence than *.
-(*px)++; // Increment the value px is pointing to by 1
-printf("%d\n", *px); // => Prints 1
-printf("%d\n", x); // => Prints 1
-
-int x_array[20]; // Arrays are a good way to allocate a contiguous block of memory
-int xx;
-for (xx=0; xx<20; xx++) {
-    x_array[xx] = 20 - xx;
-} // Initialize x_array to 20, 19, 18,... 2, 1
-
-// Declare a pointer of type int and initialize it to point to x_array
-int* x_ptr = x_array;
-// x_ptr now points to the first element in the array (the integer 20). 
-// This works because arrays are actually just pointers to their first element.
-
-// Arrays are pointers to their first element
-printf("%d\n", *(x_ptr)); // => Prints 20
-printf("%d\n", x_array[0]); // => Prints 20
-
-// Pointers are incremented and decremented based on their type
-printf("%d\n", *(x_ptr + 1)); // => Prints 19
-printf("%d\n", x_array[1]); // => Prints 19
-
-// You can also dynamically allocate contiguous blocks of memory with the
-// standard library function malloc, which takes one integer argument 
-// representing the number of bytes to allocate from the heap.
-int* my_ptr = (int*) malloc(sizeof(int) * 20);
-for (xx=0; xx<20; xx++) {
-    *(my_ptr + xx) = 20 - xx; // my_ptr[xx] = 20-xx would also work here
-} // Initialize memory to 20, 19, 18, 17... 2, 1 (as ints)
-
-// Dereferencing memory that you haven't allocated gives
-// unpredictable results
-printf("%d\n", *(my_ptr + 21)); // => Prints who-knows-what?
-
-// When you're done with a malloc'd block of memory, you need to free it, 
-// or else no one else can use it until your program terminates
-free(my_ptr);
-
-// Strings can be char arrays, but are usually represented as char
-// pointers:
-char* my_str = "This is my very own string";
-
-printf("%c\n", *my_str); // => 'T'
-
-function_1();
+    // While loops exist
+    int ii = 0;
+    while (ii < 10) {
+        printf("%d, ", ii++); // ii++ increments ii in-place
+                              // after yielding its value ("postincrement").
+    } // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
+
+    printf("\n");
+
+    int kk = 0;
+    do {
+        printf("%d, ", kk);
+    } while (++kk < 10); // ++kk increments kk in-place, and yields
+                         // the already incremented value ("preincrement")
+    // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
+
+    printf("\n");
+
+    // For loops too
+    int jj;
+    for (jj=0; jj < 10; jj++) {
+        printf("%d, ", jj);
+    } // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
+
+    printf("\n");
+
+    // branching with multiple choices: switch()
+    switch (some_integral_expression) {
+    case 0: // labels need to be integral *constant* epxressions
+        do_stuff();
+        break; // if you don't break, control flow falls over labels
+    case 1:
+        do_something_else();
+        break;
+    default:
+        // if `some_integral_expression` didn't match any of the labels
+        fputs("error!\n", stderr);
+        exit(-1);
+        break;
+    }
+    
+
+    ///////////////////////////////////////
+    // Typecasting
+    ///////////////////////////////////////
+
+    // Every value in C has a type, but you can cast one value into another type
+    // if you want (with some constraints).
+
+    int x_hex = 0x01; // You can assign vars with hex literals
+
+    // Casting between types will attempt to preserve their numeric values
+    printf("%d\n", x_hex); // => Prints 1
+    printf("%d\n", (short) x_hex); // => Prints 1
+    printf("%d\n", (char) x_hex); // => Prints 1
+
+    // Types will overflow without warning
+    printf("%d\n", (unsigned char) 257); // => 1 (Max char = 255 if char is 8 bits long)
+
+    // For determining the max value of a `char`, a `signed char` and an `unisigned char`,
+    // respectively, use the CHAR_MAX, SCHAR_MAX and UCHAR_MAX macros from <limits.h>
+
+    // Integral types can be cast to floating-point types, and vice-versa.
+    printf("%f\n", (float)100); // %f formats a float
+    printf("%lf\n", (double)100); // %lf formats a double
+    printf("%d\n", (char)100.0);
+
+    ///////////////////////////////////////
+    // Pointers
+    ///////////////////////////////////////
+
+    // A pointer is a variable declared to store a memory address. Its declaration will
+    // also tell you the type of data it points to. You can retrieve the memory address 
+    // of your variables, then mess with them.
+
+    int x = 0;
+    printf("%p\n", (void *)&x); // Use & to retrieve the address of a variable
+    // (%p formats an object pointer of type void *)
+    // => Prints some address in memory;
+
+
+    // Pointers start with * in their declaration
+    int *px, not_a_pointer; // px is a pointer to an int
+    px = &x; // Stores the address of x in px
+    printf("%p\n", (void *)px); // => Prints some address in memory
+    printf("%zu, %zu\n", sizeof(px), sizeof(not_a_pointer));
+    // => Prints "8, 4" on a typical 64-bit system
+
+    // To retreive the value at the address a pointer is pointing to,
+    // put * in front to de-reference it.
+    // Note: yes, it may be confusing that '*' is used for _both_ declaring a
+    // pointer and dereferencing it.
+    printf("%d\n", *px); // => Prints 0, the value of x
+
+    // You can also change the value the pointer is pointing to.
+    // We'll have to wrap the de-reference in parenthesis because
+    // ++ has a higher precedence than *.
+    (*px)++; // Increment the value px is pointing to by 1
+    printf("%d\n", *px); // => Prints 1
+    printf("%d\n", x); // => Prints 1
+
+    // Arrays are a good way to allocate a contiguous block of memory
+    int x_array[20];
+    int xx;
+    for (xx = 0; xx < 20; xx++) {
+        x_array[xx] = 20 - xx;
+    } // Initialize x_array to 20, 19, 18,... 2, 1
+
+    // Declare a pointer of type int and initialize it to point to x_array
+    int* x_ptr = x_array;
+    // x_ptr now points to the first element in the array (the integer 20). 
+    // This works because arrays often decay into pointers to their first element.
+    // For example, when an array is passed to a function or is assigned to a pointer,
+    // it decays into (implicitly converted to) a pointer.
+    // Exceptions: when the array is the argument of the `&` (address-od) operator:
+    int arr[10];
+    int (*ptr_to_arr)[10] = &arr; // &arr is NOT of type `int *`!
+                                  // It's of type "pointer to array" (of ten `int`s).
+    // or when the array is a string literal used for initializing a char array:
+    char arr[] = "foobarbazquirk";
+    // or when it's the argument of the `sizeof` or `alignof` operator:
+    int arr[10];
+    int *ptr = arr; // equivalent with int *ptr = &arr[0];
+    printf("%zu %zu\n", sizeof arr, sizeof ptr); // probably prints "40, 4" or "40, 8"
+
+
+    // Pointers are incremented and decremented based on their type
+    // (this is called pointer arithmetic)
+    printf("%d\n", *(x_ptr + 1)); // => Prints 19
+    printf("%d\n", x_array[1]); // => Prints 19
+
+    // You can also dynamically allocate contiguous blocks of memory with the
+    // standard library function malloc, which takes one argument of type size_t
+    // representing the number of bytes to allocate (usually from the heap, although this
+    // may not be true on e. g. embedded systems - the C standard says nothing about it).
+    int *my_ptr = malloc(sizeof(*my_ptr) * 20);
+    for (xx = 0; xx < 20; xx++) {
+        *(my_ptr + xx) = 20 - xx; // my_ptr[xx] = 20-xx
+    } // Initialize memory to 20, 19, 18, 17... 2, 1 (as ints)
+
+    // Dereferencing memory that you haven't allocated gives
+    // "unpredictable results" - the program is said to invoke "undefined behavior"
+    printf("%d\n", *(my_ptr + 21)); // => Prints who-knows-what? It may even crash.
+
+    // When you're done with a malloc'd block of memory, you need to free it, 
+    // or else no one else can use it until your program terminates
+    // (this is called a "memory leak"):
+    free(my_ptr);
+
+    // Strings are arrays of char, but they are usually represented as a
+    // pointer-to-char (which is a pointer to the first element of the array).
+    // It's good practice to use `const char *' when referring to a string literal,
+    // since string literals shall not be modified (i. e. "foo"[0] = 'a' is ILLEGAL.)
+    const char *my_str = "This is my very own string literal";
+    printf("%c\n", *my_str); // => 'T'
+
+    // This is not the case if the string is an array
+    // (potentially initialized with a string literal)
+    // that resides in writable memory, as in:
+    char foo[] = "foo";
+    foo[0] = 'a'; // this is legal, foo now contains "aoo"
+
+    function_1();
 } // end main function
 
 ///////////////////////////////////////
@@ -297,7 +377,8 @@ function_1();
 // Function declaration syntax:
 // <return type> <function name>(<args>)
 
-int add_two_ints(int x1, int x2){
+int add_two_ints(int x1, int x2)
+{
     return x1 + x2; // Use return to return a value
 }
 
@@ -309,10 +390,12 @@ Example: in-place string reversal
 */
 
 // A void function returns no value
-void str_reverse(char* str_in){
+void str_reverse(char *str_in)
+{
     char tmp;
-    int ii=0, len = strlen(str_in); // Strlen is part of the c standard library
-    for(ii=0; ii<len/2; ii++){
+    int ii = 0;
+    size_t len = strlen(str_in); // `strlen()` is part of the c standard library
+    for (ii = 0; ii < len / 2; ii++) {
         tmp = str_in[ii];
         str_in[ii] = str_in[len - ii - 1]; // ii-th char from end
         str_in[len - ii - 1] = tmp;
@@ -333,15 +416,20 @@ printf("%s\n", c); // => ".tset a si sihT"
 typedef int my_type;
 my_type my_type_var = 0;
 
-// Structs are just collections of data
+// Structs are just collections of data, the members are allocated sequentially,
+// in the order they are written:
 struct rectangle {
     int width;
     int height;
 };
 
+// It's not generally true that
+// sizeof(struct rectangle) == sizeof(int) + sizeof(int)
+// due to potential padding between the structure members (this is for alignment
+// reasons). [1]
 
-void function_1(){
-
+void function_1()
+{
     struct rectangle my_rec;
 
     // Access struct members with .
@@ -349,37 +437,46 @@ void function_1(){
     my_rec.height = 20;
 
     // You can declare pointers to structs
-    struct rectangle* my_rec_ptr = &my_rec;
+    struct rectangle *my_rec_ptr = &my_rec;
 
     // Use dereferencing to set struct pointer members...
     (*my_rec_ptr).width = 30;
 
-    // ... or use the -> shorthand
+    // ... or even better: prefer the -> shorthand for the sake of readability
     my_rec_ptr->height = 10; // Same as (*my_rec_ptr).height = 10;
 }
 
 // You can apply a typedef to a struct for convenience
 typedef struct rectangle rect;
 
-int area(rect r){
+int area(rect r)
+{
     return r.width * r.height;
 }
 
+// if you have large structs, you can pass them "by pointer" to avoid copying
+// the whole struct:
+int area(const rect *r)
+{
+    return r->width * r->height;
+}
+
 ///////////////////////////////////////
 // Function pointers 
 ///////////////////////////////////////
 /*
 At runtime, functions are located at known memory addresses. Function pointers are
-much likely any other pointer (they just store a memory address), but can be used 
+much like any other pointer (they just store a memory address), but can be used 
 to invoke functions directly, and to pass handlers (or callback functions) around.
 However, definition syntax may be initially confusing.
 
 Example: use str_reverse from a pointer
 */
-void str_reverse_through_pointer(char * str_in) {
+void str_reverse_through_pointer(char *str_in) {
     // Define a function pointer variable, named f. 
     void (*f)(char *); // Signature should exactly match the target function.
     f = &str_reverse; // Assign the address for the actual function (determined at runtime)
+    // f = str_reverse; would work as well - functions decay into pointers, similar to arrays
     (*f)(str_in); // Just calling the function through the pointer
     // f(str_in); // That's an alternative but equally valid syntax for calling it.
 }
@@ -391,7 +488,7 @@ Function pointers are usually typedef'd for simplicity and readability, as follo
 
 typedef void (*my_fnp_type)(char *);
 
-// The used when declaring the actual pointer variable:
+// Then used when declaring the actual pointer variable:
 // ...
 // my_fnp_type f; 
 
@@ -400,7 +497,17 @@ typedef void (*my_fnp_type)(char *);
 ## Further Reading
 
 Best to find yourself a copy of [K&R, aka "The C Programming Language"](https://en.wikipedia.org/wiki/The_C_Programming_Language)
+It is *the* book about C, written by the creators of C. Be careful, though - it's ancient and it contains some
+inaccuracies (well, ideas that are not considered good anymore) or now-changed practices.
 
-Another good resource is [Learn C the hard way](http://c.learncodethehardway.org/book/)
+Another good resource is [Learn C the hard way](http://c.learncodethehardway.org/book/).
+
+If you have a question, read the [compl.lang.c Frequently Asked Questions](http://c-faq.com).
+
+It's very important to use proper spacing, indentation and to be consistent with your coding style in general.
+Readable code is better than clever code and fast code. For a good, sane coding style to adopt, see the
+[Linux kernel coding stlye](https://www.kernel.org/doc/Documentation/CodingStyle).
 
 Other than that, Google is your friend.
+
+[1] http://stackoverflow.com/questions/119123/why-isnt-sizeof-for-a-struct-equal-to-the-sum-of-sizeof-of-each-member
diff --git a/clojure.html.markdown b/clojure.html.markdown
index 6baae0ce..a502a95c 100644
--- a/clojure.html.markdown
+++ b/clojure.html.markdown
@@ -365,7 +365,7 @@ my-atom  ;=> Atom<#...> (Returns the Atom object)
 
 ### Further Reading
 
-This is far from exhaustive, but hopefully it's enought o get you on your feet.
+This is far from exhaustive, but hopefully it's enough to get you on your feet.
 
 Clojure.org has lots of articles:
 [http://clojure.org/](http://clojure.org/)
diff --git a/common-lisp.html.markdown b/common-lisp.html.markdown
new file mode 100644
index 00000000..a917304c
--- /dev/null
+++ b/common-lisp.html.markdown
@@ -0,0 +1,605 @@
+---
+
+language: "Common Lisp"
+filename: commonlisp.lisp
+contributors:
+  - ["Paul Nathan", "https://github.com/pnathan"]
+---
+
+ANSI Common Lisp is a general purpose, multi-paradigm programming
+language suited for a wide variety of industry applications. It is
+frequently referred to a programmable programming language.
+
+The classic starting point is [Practical Common Lisp and freely available.](http://www.gigamonkeys.com/book/)
+
+Another popular and recent book is
+[Land of Lisp](http://landoflisp.com/).
+
+
+
+```scheme
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; 0. Syntax
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; General form.
+
+;; Lisp has two fundamental pieces of syntax: the ATOM and the
+;; S-expression. Typically, grouped S-expressions are called `forms`.
+
+10  ; an atom; it evaluates to itself
+
+:THING ;Another atom; evaluating to the symbol :thing.
+
+t  ; another atom, denoting true.
+
+(+ 1 2 3 4) ; an s-expression
+
+'(4 :foo  t)  ;another one
+
+
+;;; Comments
+
+;; Single line comments start with a semicolon; use two for normal
+;; comments, three for section comments, and four for file-level
+;; comments.
+
+#| Block comments
+   can span multiple lines and...
+    #|
+       they can be nested!
+    |#
+|#
+
+;;; Environment.
+
+;; A variety of implementations exist; most are
+;; standard-conformant. CLISP is a good starting one.
+
+;; Libraries are managed through Quicklisp.org's Quicklisp system.
+
+;; Common Lisp is usually developed with a text editor and a REPL
+;; (Read Evaluate Print Loop) running at the same time. The REPL
+;; allows for interactive exploration of the program as it is "live"
+;; in the system.
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; 1. Primitive Datatypes and Operators
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; Symbols
+
+'foo ; => FOO  Notice that the symbol is upper-cased automatically.
+
+;; Intern manually creates a symbol from a string.
+
+(intern "AAAA") ; => AAAA
+
+(intern "aaa") ; => |aaa|
+
+;;; Numbers
+9999999999999999999999 ; integers
+#b111                  ; binary => 7
+#o111                  ; octal => 73
+#x111                  ; hexadecimal => 273
+3.14159s0              ; single
+3.14159d0              ; double
+1/2                    ; ratios
+#C(1 2)                ; complex numbers
+
+
+;; Function application is written (f x y z ...)
+;; where f is a function and x, y, z, ... are operands
+;; If you want to create a literal list of data, use ' to stop it from
+;; being evaluated - literally, "quote" the data.
+'(+ 1 2) ; => (+ 1 2)
+;; You can also call a function manually:
+(funcall #'+ 1 2 3) ; => 6
+;; Some arithmetic operations
+(+ 1 1)              ; => 2
+(- 8 1)              ; => 7
+(* 10 2)             ; => 20
+(expt 2 3)           ; => 8
+(mod 5 2)            ; => 1
+(/ 35 5)             ; => 7
+(/ 1 3)              ; => 1/3
+(+ #C(1 2) #C(6 -4)) ; => #C(7 -2)
+
+                     ;;; Booleans
+t                    ; for true (any not-nil value is true)
+nil                  ; for false - and the empty list
+(not nil)            ; => t
+(and 0 t)            ; => t
+(or 0 nil)           ; => 0
+
+                     ;;; Characters
+#\A                  ; => #\A
+#\λ                  ; => #\GREEK_SMALL_LETTER_LAMDA
+#\u03BB              ; => #\GREEK_SMALL_LETTER_LAMDA
+
+;;; Strings are fixed-length arrays of characters.
+"Hello, world!"
+"Benjamin \"Bugsy\" Siegel"   ; backslash is an escaping character
+
+;; Strings can be concatenated too!
+(concatenate 'string "Hello " "world!") ; => "Hello world!"
+
+;; A string can be treated like a sequence of characters
+(elt "Apple" 0) ; => #\A
+
+;; format can be used to format strings:
+(format nil "~a can be ~a" "strings" "formatted")
+
+;; Printing is pretty easy; ~% is the format specifier for newline.
+(format t "Common Lisp is groovy. Dude.~%")
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 2. Variables
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; You can create a global (dynamically scoped) using defparameter
+;; a variable name can use any character except: ()[]{}",'`;#|\
+
+;; Dynamically scoped variables should have earmuffs in their name!
+
+(defparameter *some-var* 5)
+*some-var* ; => 5
+
+;; You can also use unicode characters.
+(defparameter *AΛB* nil)
+
+
+;; Accessing a previously unbound variable is an
+;; undefined behavior (but possible). Don't do it.
+
+
+;; Local binding: `me` is bound to "dance with you" only within the
+;; (let ...). Let always returns the value of the last `form` in the
+;; let form.
+
+(let ((me "dance with you"))
+  me)
+;; => "dance with you"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 3. Structs and Collections
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Structs
+(defstruct dog name breed age)
+(defparameter *rover*
+    (make-dog :name "rover"
+              :breed "collie"
+              :age 5))
+*rover* ; => #S(DOG :NAME "rover" :BREED "collie" :AGE 5)
+
+(dog-p *rover*) ; => t  ;; ewww)
+(dog-name *rover*) ; => "rover"
+
+;; Dog-p, make-dog, and dog-name are all created by defstruct!
+
+;;; Pairs
+;; `cons' constructs pairs, `car' and `cdr' extract the first
+;; and second elements
+(cons 'SUBJECT 'VERB) ; => '(SUBJECT . VERB)
+(car (cons 'SUBJECT 'VERB)) ; => SUBJECT
+(cdr (cons 'SUBJECT 'VERB)) ; => VERB
+
+;;; Lists
+
+;; Lists are linked-list data structures, made of `cons' pairs and end
+;; with a `nil' (or '()) to mark the end of the list
+(cons 1 (cons 2 (cons 3 nil))) ; => '(1 2 3)
+;; `list' is a convenience variadic constructor for lists
+(list 1 2 3) ; => '(1 2 3)
+;; and a quote can also be used for a literal list value
+'(1 2 3) ; => '(1 2 3)
+
+;; Can still use `cons' to add an item to the beginning of a list
+(cons 4 '(1 2 3)) ; => '(4 1 2 3)
+
+;; Use `append' to - surprisingly - append lists together
+(append '(1 2) '(3 4)) ; => '(1 2 3 4)
+
+;; Or use concatenate -
+
+(concatenate
+
+;; Lists are a very central type, so there is a wide variety of functionality for
+;; them, a few examples:
+(mapcar #'1+ '(1 2 3))             ; => '(2 3 4)
+(mapcar #'+ '(1 2 3) '(10 20 30))  ; => '(11 22 33)
+(remove-if-not #'evenp '(1 2 3 4)) ; => '(2 4)
+(every #'evenp '(1 2 3 4))         ; => nil
+(some #'oddp '(1 2 3 4))           ; => T
+(butlast '(subject verb object))   ; => (SUBJECT VERB)
+
+
+;;; Vectors
+
+;; Vectors are fixed-length arrays
+#(1 2 3) ; => #(1 2 3)
+
+;; Use concatenate to add vectors together
+(concatenate 'vector #(1 2 3) #(4 5 6)) ; => #(1 2 3 4 5 6)
+
+;;; Arrays
+
+;; Both vectors and strings are special-cases of arrays.
+
+;; 2D arrays
+
+(make-array (list 2 2))
+
+;; (make-array '(2 2)) works as well.
+
+; => #2A((0 0) (0 0))
+
+(make-array (list 2 2 2))
+
+; => #3A(((0 0) (0 0)) ((0 0) (0 0)))
+
+;; Caution- the default initial values are
+;; implementation-defined. Here's how to define them:
+
+(make-array '(2) :initial-element 'unset)
+
+; => #(UNSET UNSET)
+
+;; And, to access the element at 1,1,1 -
+(aref (make-array (list 2 2 2)) 1 1 1)
+
+; => 0
+
+;;; Naively, sets are just lists:
+
+(set-difference '(1 2 3 4) '(4 5 6 7)) ; => (3 2 1)
+(intersection '(1 2 3 4) '(4 5 6 7)) ; => 4
+(union '(1 2 3 4) '(4 5 6 7))        ; => (3 2 1 4 5 6 7)
+(adjoin 4 '(1 2 3 4))     ; => (1 2 3 4)
+
+;; But you'll want to use a better data structure than a linked list
+;; for performant work!
+
+;;; Dictionaries are implemented as hash tables.
+
+;; Create a hash table
+(defparameter *m* (make-hash-table))
+
+;; set a value
+(setf (gethash 'a *m*) 1)
+
+;; Retrieve a value
+(gethash 'a *m*) ; => 1, t
+
+;; Detail - Common Lisp has multiple return values possible. gethash
+;; returns t in the second value if anything was found, and nil if
+;; not.
+
+;; Retrieving a non-present value returns nil
+ (gethash *m* 'd) ;=> nil, nil
+
+;; You can provide a default value for missing keys
+(gethash *m* 'd :not-found) ; => :NOT-FOUND
+
+;; Let's handle the multiple return values here in code.
+
+(multiple-value-bind
+      (a b)
+    (gethash 'd *m*)
+  (list a b))
+; => (NIL NIL)
+
+(multiple-value-bind
+      (a b)
+    (gethash 'a *m*)
+  (list a b))
+; => (1 T)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 3. Functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Use `lambda' to create anonymous functions.
+;; A function always returns the value of its last expression.
+;; The exact printable representation of a function will vary...
+
+(lambda () "Hello World") ; => #<FUNCTION (LAMBDA ()) {1004E7818B}>
+
+;; Use funcall to call lambda functions
+(funcall (lambda () "Hello World")) ; => "Hello World"
+
+;; Or Apply
+(apply (lambda () "Hello World") nil) ; => "Hello World"
+
+;; De-anonymize the function
+(defun hello-world ()
+   "Hello World")
+(hello-world) ; => "Hello World"
+
+;; The () in the above is the list of arguments for the function
+(defun hello (name)
+   (format nil "Hello, ~a " name))
+
+(hello "Steve") ; => "Hello, Steve"
+
+;; Functions can have optional arguments; they default to nil
+
+(defun hello (name &optional from)
+    (if from
+        (format t "Hello, ~a, from ~a" name from)
+        (format t "Hello, ~a" name)))
+
+ (hello "Jim" "Alpacas") ;; => Hello, Jim, from Alpacas
+
+;; And the defaults can be set...
+(defun hello (name &optional (from "The world"))
+   (format t "Hello, ~a, from ~a" name from))
+
+(hello "Steve")
+; => Hello, Steve, from The world
+
+(hello "Steve" "the alpacas")
+; => Hello, Steve, from the alpacas
+
+
+;; And of course, keywords are allowed as well... usually more
+;;   flexible than &optional.
+
+(defun generalized-greeter (name &key (from "the world") (honorific "Mx"))
+    (format t "Hello, ~a ~a, from ~a" honorific name from))
+
+(generalized-greeter "Jim")   ; => Hello, Mx Jim, from the world
+
+(generalized-greeter "Jim" :from "the alpacas you met last summer" :honorific "Mr")
+; => Hello, Mr Jim, from the alpacas you met last summer
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 4. Equality
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Common Lisp has a sophisticated equality system. A couple are covered yere.
+
+;; for numbers use `='
+(= 3 3.0) ; => t
+(= 2 1) ; => nil
+
+;; for object identity (approximately) use `eql`
+(eql 3 3) ; => t
+(eql 3 3.0) ; => nil
+(eql (list 3) (list 3)) ; => nil
+
+;; for lists, strings, and bit-vectors use `equal'
+(equal (list 'a 'b) (list 'a 'b)) ; => t
+(equal (list 'a 'b) (list 'b 'a)) ; => nil
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 5. Control Flow
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; Conditionals
+
+(if t                ; test expression
+    "this is true"   ; then expression
+    "this is false") ; else expression
+; => "this is true"
+
+;; In conditionals, all non-nil values are treated as true
+(member 'Groucho '(Harpo Groucho Zeppo)) ; => '(GROUCHO ZEPPO)
+(if (member 'Groucho '(Harpo Groucho Zeppo))
+    'yep
+    'nope)
+; => 'YEP
+
+;; `cond' chains a series of tests to select a result
+(cond ((> 2 2) (error "wrong!"))
+      ((< 2 2) (error "wrong again!"))
+      (t 'ok)) ; => 'OK
+
+;; Typecase switches on the type of the value
+(typecase 1
+  (string :string)
+  (integer :int))
+
+; => :int
+
+;;; Iteration
+
+;; Of course recursion is supported:
+
+(defun walker (n)
+  (if (zerop n)
+      :walked
+      (walker (1- n))))
+
+(walker) ; => :walked
+
+;; Most of the time, we use DOLIST or LOOP
+
+
+(dolist (i '(1 2 3 4))
+  (format t "~a" i))
+
+; => 1234
+
+(loop for i from 0 below 10
+      collect i)
+
+; => (0 1 2 3 4 5 6 7 8 9)
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 6. Mutation
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Use `setf' to assign a new value to an existing variable. This was
+;; demonstrated earlier in the hash table example.
+
+(let ((variable 10))
+    (setf variable 2))
+ ; => 2
+
+
+;; Good Lisp style is to minimize destructive functions and to avoid
+;; mutation when reasonable.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 7. Classes and Objects
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; No more Animal classes, let's have Human-Powered Mechanical
+;; Conveyances.
+
+(defclass human-powered-conveyance ()
+  ((velocity
+    :accessor velocity
+    :initarg :velocity)
+   (average-efficiency
+    :accessor average-efficiency)
+   :initarg :average-efficiency)
+  (:documentation "A human powered conveyance"))
+
+;; defclass, followed by name, followed by the superclass list,
+;; followed by slot list, followed by optional qualities such as
+;; :documentation.
+
+;; When no superclass list is set, the empty list defaults to the
+;; standard-object class. This *can* be changed, but not until you
+;; know what you're doing. Look up the Art of the Metaobject Protocol
+;; for more information.
+
+(defclass bicycle (human-powered-conveyance)
+  ((wheel-size
+    :accessor wheel-size
+    :initarg :wheel-size
+    :documentation "Diameter of the wheel.")
+   (height
+    :accessor height
+    :initarg :height)))
+
+(defclass recumbent (bicycle)
+  ((chain-type
+    :accessor chain-type
+    :initarg  :chain-type)))
+
+(defclass unicycle (human-powered-conveyance) nil)
+
+(defclass canoe (human-powered-conveyance)
+  ((number-of-rowers
+    :accessor number-of-rowers
+    :initarg :number-of-rowers)))
+
+
+;; Calling DESCRIBE on the human-powered-conveyance class in the REPL gives:
+
+(describe 'human-powered-conveyance)
+
+; COMMON-LISP-USER::HUMAN-POWERED-CONVEYANCE
+;  [symbol]
+;
+; HUMAN-POWERED-CONVEYANCE names the standard-class #<STANDARD-CLASS
+;                                                    HUMAN-POWERED-CONVEYANCE>:
+;  Documentation:
+;    A human powered conveyance
+;  Direct superclasses: STANDARD-OBJECT
+;  Direct subclasses: UNICYCLE, BICYCLE, CANOE
+;  Not yet finalized.
+(defparameter *foo#\u03BBooo* nil) ;  Direct slots:
+;    VELOCITY
+;      Readers: VELOCITY
+;      Writers: (SETF VELOCITY)
+;    AVERAGE-EFFICIENCY
+;      Readers: AVERAGE-EFFICIENCY
+;      Writers: (SETF AVERAGE-EFFICIENCY)
+
+;; Note the reflective behavior available to you! Common Lisp is
+;; designed to be an interactive system
+
+;; To define a method, let's find out what our circumference of the
+;; bike wheel turns out to be using the equation: C = d * pi
+
+(defmethod circumference ((object bicycle))
+  (* pi (wheel-size object)))
+
+;; pi is defined in Lisp already for us!
+
+;; Let's suppose we find out that the efficiency value of the number
+;; of rowers in a canoe is roughly logarithmic. This should probably be set
+;; in the constructor/initializer.
+
+;; Here's how to initialize your instance after Common Lisp gets done
+;; constructing it:
+
+(defmethod initialize-instance :after ((object canoe) &rest args)
+  (setf (average-efficiency object)  (log (1+ (number-of-rowers object)))))
+
+;; Then to construct an instance and check the average efficiency...
+
+(average-efficiency (make-instance 'canoe :number-of-rowers 15))
+; => 2.7725887
+
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 8. Macros
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Macros let you extend the syntax of the language
+
+;; Common Lisp doesn't come with a WHILE loop- let's add one.
+;; If we obey our assembler instincts, we wind up with:
+
+(defmacro while (condition &body body)
+    "While `condition` is true, `body` is executed.
+
+`condition` is tested prior to each execution of `body`"
+    (let ((block-name (gensym)))
+        `(tagbody
+           (unless ,condition
+               (go ,block-name))
+           (progn
+           ,@body)
+           ,block-name)))
+
+;; Let's look at the high-level version of this:
+
+
+(defmacro while (condition &body body)
+    "While `condition` is true, `body` is executed.
+
+`condition` is tested prior to each execution of `body`"
+  `(loop while ,condition
+         do
+         (progn
+            ,@body)))
+
+;; However, with a modern compiler, this is not required; the LOOP
+;; form compiles equally well and is easier to read.
+
+;; Note that ``` is used, as well as `,` and `@`. ``` is a quote-type operator
+;; known as quasiquote; it allows the use of `,` . `,` allows "unquoting"
+;; variables. @ interpolates lists.
+
+;; Gensym creates a unique symbol guaranteed to not exist elsewhere in
+;; the system. This is because macros are expanded at compile time and
+;; variables declared in the macro can collide with variables used in
+;; regular code.
+
+;; See Practical Common Lisp for more information on macros.
+```
+
+
+## Further Reading
+
+[Keep moving on to the Practical Common Lisp book.](http://www.gigamonkeys.com/book/)
+
+
+## Credits.
+
+Lots of thanks to the Scheme people for rolling up a great starting
+point which could be easily moved to Common Lisp.
+
+- [Paul Khoung](https://github.com/pkhuong) for some great reviewing.
diff --git a/csharp.html.markdown b/csharp.html.markdown
new file mode 100644
index 00000000..55de415d
--- /dev/null
+++ b/csharp.html.markdown
@@ -0,0 +1,622 @@
+---
+
+language: c#
+contributors:
+    - ["Irfan Charania", "https://github.com/irfancharania"]
+    - ["Max Yankov", "https://github.com/golergka"]
+filename: LearnCSharp.cs
+
+---
+
+C# is an elegant and type-safe object-oriented language that enables developers to build a variety of secure and robust applications that run on the .NET Framework.
+
+[Read more here.](http://msdn.microsoft.com/en-us/library/vstudio/z1zx9t92.aspx)
+
+```c#
+// Single-line comments start with //
+/*
+Multi-line comments look like this
+*/
+/// <summary>
+/// This is an XML documentation comment
+/// </summary>
+
+// Specify namespaces application will be using
+using System;
+using System.Collections.Generic;
+
+
+// defines scope to organize code into "packages"
+namespace Learning
+{
+    // Each .cs file should at least contain a class with the same name as the file
+    // you're allowed to do otherwise, but shouldn't for sanity.
+    public class LearnCSharp
+    {
+        // A console application must have a main method as an entry point
+        public static void Main(string[] args)
+        {
+            // Use Console.WriteLine to print lines
+            Console.WriteLine("Hello World");
+            Console.WriteLine(
+                "Integer: " + 10 +
+                " Double: " + 3.14 +
+                " Boolean: " + true);
+
+            // To print without a new line, use Console.Write
+            Console.Write("Hello ");
+            Console.Write("World");
+
+
+            ///////////////////////////////////////////////////
+            // Types & Variables
+            //
+            // Declare a variable using <type> <name>
+            ///////////////////////////////////////////////////
+
+            // Sbyte - Signed 8-bit integer
+            // (-128 <= sbyte <= 127)
+            sbyte fooSbyte = 100;
+
+            // Byte - Unsigned 8-bit integer
+            // (0 <= byte <= 255)
+            byte fooByte = 100;
+
+            // Short - Signed 16-bit integer
+            // (-32,768 <= short <= 32,767)
+            short fooShort = 10000;
+
+            // Ushort - Unsigned 16-bit integer
+            // (0 <= ushort <= 65,535)
+            ushort fooUshort = 10000;
+
+            // Integer - Signed 32-bit integer
+            // (-2,147,483,648 <= int <= 2,147,483,647)
+            int fooInt = 1;
+
+            // Uinteger - Unsigned 32-bit integer
+            // (0 <= uint <= 4,294,967,295)
+            uint fooUint = 1;
+
+            // Long - Signed 64-bit integer
+            // (-9,223,372,036,854,775,808 <= long <= 9,223,372,036,854,775,807)
+            long fooLong = 100000L;
+            // L is used to denote that this variable value is of type long or ulong
+            // anything without is treated as int or uint depending on size.
+
+            // Ulong - Unsigned 64-bit integer
+            // (0 <= ulong <= 18,446,744,073,709,551,615)
+            ulong fooUlong = 100000L;
+
+            // Float - Single-precision 32-bit IEEE 754 Floating Point
+            // Precision: 7 digits
+            float fooFloat = 234.5f;
+            // f is used to denote that this variable value is of type float;
+            // otherwise it is treated as double.
+
+            // Double - Double-precision 64-bit IEEE 754 Floating Point
+            // Precision: 15-16 digits
+            double fooDouble = 123.4;
+
+            // Bool - true & false
+            bool fooBoolean = true;
+            bool barBoolean = false;
+
+            // Char - A single 16-bit Unicode character
+            char fooChar = 'A';
+
+            // Strings
+            string fooString = "My string is here!";
+            Console.WriteLine(fooString);
+
+            // formatting
+            string fooFs = string.Format("Check Check, {0} {1}, {0} {1:0.0}", 1, 2);
+            Console.WriteLine(fooFormattedString);
+
+            // formatting dates
+            DateTime fooDate = DateTime.Now;
+            Console.WriteLine(fooDate.ToString("hh:mm, dd MMM yyyy"));
+
+            // \n is an escaped character that starts a new line
+            string barString = "Printing on a new line?\nNo Problem!";
+            Console.WriteLine(barString);
+
+            // it can be written prettier by using the @ symbol
+            string bazString = @"Here's some stuff
+    on a new line!";
+            Console.WriteLine(bazString);
+
+            // quotes need to be escaped
+            // use \" normally
+            string quotedString = "some \"quoted\" stuff";
+            Console.WriteLine(quotedString);
+
+            // use "" when strings start with @
+            string quotedString2 = @"some MORE ""quoted"" stuff";
+            Console.WriteLine(quotedString2);
+
+            // Use const or read-only to make a variable immutable
+            // const values are calculated at compile time
+            const int HOURS_I_WORK_PER_WEEK = 9001;
+
+            // Nullable types
+            // any type can be made nullable by suffixing a ?
+            // <type>? <var name> = <value>
+            int? nullable = null;
+            Console.WriteLine("Nullable variable: " + nullable);
+
+            // In order to use nullable's value, you have to use Value property or to explicitly cast it
+            string? nullableString = "not null";
+            Console.WriteLine("Nullable value is: " + nullableString.Value + " or: " + (string) nullableString );
+
+            // ?? is syntactic sugar for specifying default value
+            // in case variable is null
+            int notNullable = nullable ?? 0;
+            Console.WriteLine("Not nullable variable: " + notNullable);
+
+            // Var - compiler will choose the most appropriate type based on value
+            var fooImplicit = true;
+
+            ///////////////////////////////////////////////////
+            // Data Structures
+            ///////////////////////////////////////////////////
+            Console.WriteLine("\n->Data Structures");
+
+            // Arrays
+            // The array size must be decided upon declaration
+            // The format for declaring an array is follows:
+            // <datatype>[] <var name> = new <datatype>[<array size>];
+            int[] intArray = new int[10];
+            string[] stringArray = new string[1];
+            bool[] boolArray = new bool[100];
+
+            // Another way to declare & initialize an array
+            int[] y = { 9000, 1000, 1337 };
+
+            // Indexing an array - Accessing an element
+            Console.WriteLine("intArray @ 0: " + intArray[0]);
+
+            // Arrays are zero-indexed and mutable.
+            intArray[1] = 1;
+            Console.WriteLine("intArray @ 1: " + intArray[1]); // => 1
+
+            // Lists
+            // Lists are used more frequently than arrays as they are more flexible
+            // The format for declaring a list is follows:
+            // List<datatype> <var name> = new List<datatype>();
+            List<int> intList = new List<int>();
+            List<string> stringList = new List<string>();
+
+            // Another way to declare & initialize a list
+            List<int> z = new List<int> { 9000, 1000, 1337 };
+
+            // Indexing a list - Accessing an element
+            // Lists are zero-indexed and mutable.
+            Console.WriteLine("z @ 0: " + z[2]);
+
+            // Lists don't default to a value;
+            // A value must be added before accessing the index
+            intList.Add(1);
+            Console.WriteLine("intList @ 0: " + intList[0]);
+
+
+            // Others data structures to check out:
+            //
+            // Stack/Queue
+            // Dictionary
+            // Read-only Collections
+            // Tuple (.Net 4+)
+
+
+            ///////////////////////////////////////
+            // Operators
+            ///////////////////////////////////////
+            Console.WriteLine("\n->Operators");
+
+            int i1 = 1, i2 = 2; // Shorthand for multiple declarations
+
+            // Arithmetic is straightforward
+            Console.WriteLine("1+2 = " + (i1 + i2)); // => 3
+            Console.WriteLine("2-1 = " + (i2 - i1)); // => 1
+            Console.WriteLine("2*1 = " + (i2 * i1)); // => 2
+            Console.WriteLine("1/2 = " + (i1 / i2)); // => 0 (0.5 truncated down)
+
+            // Modulo
+            Console.WriteLine("11%3 = " + (11 % 3)); // => 2
+
+            // Comparison operators
+            Console.WriteLine("3 == 2? " + (3 == 2)); // => false
+            Console.WriteLine("3 != 2? " + (3 != 2)); // => true
+            Console.WriteLine("3 > 2? " + (3 > 2)); // => true
+            Console.WriteLine("3 < 2? " + (3 < 2)); // => false
+            Console.WriteLine("2 <= 2? " + (2 <= 2)); // => true
+            Console.WriteLine("2 >= 2? " + (2 >= 2)); // => true
+
+            // Bitwise operators!
+            /*
+            ~       Unary bitwise complement
+            <<      Signed left shift
+            >>      Signed right shift
+            >>>     Unsigned right shift
+            &       Bitwise AND
+            ^       Bitwise exclusive OR
+            |       Bitwise inclusive OR
+            */
+
+            // Incrementations
+            int i = 0;
+            Console.WriteLine("\n->Inc/Dec-rementation");
+            Console.WriteLine(i++); //i = 1. Post-Incrementation
+            Console.WriteLine(++i); //i = 2. Pre-Incrementation
+            Console.WriteLine(i--); //i = 1. Post-Decrementation
+            Console.WriteLine(--i); //i = 0. Pre-Decrementation
+
+
+            ///////////////////////////////////////
+            // Control Structures
+            ///////////////////////////////////////
+            Console.WriteLine("\n->Control Structures");
+
+            // If statements are c-like
+            int j = 10;
+            if (j == 10)
+            {
+                Console.WriteLine("I get printed");
+            }
+            else if (j > 10)
+            {
+                Console.WriteLine("I don't");
+            }
+            else
+            {
+                Console.WriteLine("I also don't");
+            }
+
+            // Ternary operators
+            // A simple if/else can be written as follows
+            // <condition> ? <true> : <false>
+            string isTrue = (true) ? "True" : "False";
+            Console.WriteLine("Ternary demo: " + isTrue);
+
+
+            // While loop
+            int fooWhile = 0;
+            while (fooWhile < 100)
+            {
+                //Console.WriteLine(fooWhile);
+                //Increment the counter
+                //Iterated 99 times, fooWhile 0->99
+                fooWhile++;
+            }
+            Console.WriteLine("fooWhile Value: " + fooWhile);
+
+            // Do While Loop
+            int fooDoWhile = 0;
+            do
+            {
+                //Console.WriteLine(fooDoWhile);
+                //Increment the counter
+                //Iterated 99 times, fooDoWhile 0->99
+                fooDoWhile++;
+            } while (fooDoWhile < 100);
+            Console.WriteLine("fooDoWhile Value: " + fooDoWhile);
+
+            // For Loop
+            int fooFor;
+            //for loop structure => for(<start_statement>; <conditional>; <step>)
+            for (fooFor = 0; fooFor < 10; fooFor++)
+            {
+                //Console.WriteLine(fooFor);
+                //Iterated 10 times, fooFor 0->9
+            }
+            Console.WriteLine("fooFor Value: " + fooFor);
+
+            // Switch Case
+            // A switch works with the byte, short, char, and int data types.
+            // It also works with enumerated types (discussed in Enum Types),
+            // the String class, and a few special classes that wrap
+            // primitive types: Character, Byte, Short, and Integer.
+            int month = 3;
+            string monthString;
+            switch (month)
+            {
+                case 1:
+                    monthString = "January";
+                    break;
+                case 2:
+                    monthString = "February";
+                    break;
+                case 3:
+                    monthString = "March";
+                    break;
+                default:
+                    monthString = "Some other month";
+                    break;
+            }
+            Console.WriteLine("Switch Case Result: " + monthString);
+
+
+            ///////////////////////////////////////
+            // Converting Data Types And Typcasting
+            ///////////////////////////////////////
+
+            // Converting data
+
+            // Convert String To Integer
+            // this will throw an Exception on failure
+            int.Parse("123");//returns an integer version of "123"
+
+            // try parse will default to type default on failure
+            // in this case: 0
+            int tryInt;
+            int.TryParse("123", out tryInt);
+
+            // Convert Integer To String
+            // Convert class has a number of methods to facilitate conversions
+            Convert.ToString(123);
+
+            ///////////////////////////////////////
+            // Classes And Functions
+            ///////////////////////////////////////
+
+            Console.WriteLine("\n->Classes & Functions");
+
+            // (definition of the Bicycle class follows)
+
+            // Use new to instantiate a class
+            Bicycle trek = new Bicycle();
+
+            // Call object methods
+            trek.speedUp(3); // You should always use setter and getter methods
+            trek.setCadence(100);
+
+            // ToString is a convention to display the value of this Object.
+            Console.WriteLine("trek info: " + trek.ToString());
+
+            // Instantiate another new Bicycle
+            Bicycle octo = new Bicycle(5, 10);
+            Console.WriteLine("octo info: " + octo.ToString());
+
+            // Instantiate a new Penny Farthing
+            PennyFarthing funbike = new PennyFarthing(1, 10);
+            Console.WriteLine("funbike info: " + funbike.ToString());
+
+            Console.Read();
+        } // End main method
+
+
+    } // End LearnCSharp class
+
+    // You can include other classes in a .cs file
+
+
+    // Class Declaration Syntax:
+    // <public/private/protected> class <class name>{
+    //    //data fields, constructors, functions all inside.
+    //    //functions are called as methods in Java.
+    // }
+
+    public class Bicycle
+    {
+        // Bicycle's Fields/Variables
+        public int cadence; // Public: Can be accessed from anywhere
+        private int _speed;  // Private: Only accessible from within the class
+        protected int gear; // Protected: Accessible from the class and subclasses
+        internal int wheels; // Internal: Accessible from within the assembly
+        string name; // Everything is private by default: Only accessible from within this class
+
+        // Enum is a value type that consists of a set of named constants
+        public enum Brand
+        {
+            AIST,
+            BMC,
+            Electra,
+            Gitane
+        }
+        // We defined this type inside a Bicycle class, so it is a nested type
+        // Code outside of this class should reference this type as Bicycle.Brand
+
+        public Brand brand; // After declaing an enum type, we can declare the field of this type
+
+        // Static members belong to the type itself rather then specific object.
+        static public int bicyclesCreated = 0;
+        // You can access them without a reference to any object:
+        // Console.WriteLine("Bicycles created: " + Bicycle.bicyclesCreated);
+
+        // readonly values are set at run time
+        // they can only be assigned upon declaration or in a constructor
+        readonly bool hasCardsInSpokes = false; // read-only private
+
+        // Constructors are a way of creating classes
+        // This is a default constructor
+        private Bicycle()
+        {
+            gear = 1;
+            cadence = 50;
+            _speed = 5;
+            name = "Bontrager";
+            brand = Brand.AIST;
+            bicyclesCreated++;
+        }
+
+        // This is a specified constructor (it contains arguments)
+        public Bicycle(int startCadence, int startSpeed, int startGear,
+                       string name, bool hasCardsInSpokes, Brand brand)
+        {
+            this.gear = startGear; // "this" keyword denotes the current object
+            this.cadence = startCadence;
+            this._speed = startSpeed;
+            this.name = name; // it can be useful when there's a name conflict
+            this.hasCardsInSpokes = hasCardsInSpokes;
+            this.brand = brand;
+        }
+
+        // Constructors can be chained
+        public Bicycle(int startCadence, int startSpeed, Brand brand) :
+            this(startCadence, startSpeed, 0, "big wheels", true)
+        {
+        }
+
+        // Function Syntax:
+        // <public/private/protected> <return type> <function name>(<args>)
+
+        // classes can implement getters and setters for their fields
+        // or they can implement properties
+
+        // Method declaration syntax:
+        // <scope> <return type> <method name>(<args>)
+        public int GetCadence()
+        {
+            return cadence;
+        }
+
+        // void methods require no return statement
+        public void SetCadence(int newValue)
+        {
+            cadence = newValue;
+        }
+
+        // virtual keyword indicates this method can be overridden
+        public virtual void SetGear(int newValue)
+        {
+            gear = newValue;
+        }
+
+        // Method parameters can have defaut values. In this case, methods can be called with these parameters omitted
+        public void SpeedUp(int increment = 1)
+        {
+            _speed += increment;
+        }
+
+        public void SlowDown(int decrement = 1)
+        {
+            _speed -= decrement;
+        }
+
+        // properties get/set values
+        // when only data needs to be accessed, consider using properties.
+        // properties may have either get or set, or both
+        private bool _hasTassles; // private variable
+        public bool HasTassles // public accessor
+        {
+            get { return _hasTassles; }
+            set { _hasTassles = value; }
+        }
+
+        // Properties can be auto-implemented
+        public int FrameSize
+        {
+            get;
+            // you are able to specify access modifiers for either get or set
+            // this means only Bicycle class can call set on Framesize
+            private set;
+        }
+
+        //Method to display the attribute values of this Object.
+        public override string ToString()
+        {
+            return "gear: " + gear +
+                    " cadence: " + cadence +
+                    " speed: " + _speed +
+                    " name: " + name +
+                    " cards in spokes: " + (hasCardsInSpokes ? "yes" : "no") +
+                    "\n------------------------------\n"
+                    ;
+        }
+
+        // Methods can also be static. It can be useful for helper methods
+        public static bool DidWeCreateEnoughBycles()
+        {
+            // Within a static method, we only can reference static class memebers
+            return bicyclesCreated > 9000;
+        } // If your class only needs static members, consider marking the class itself as static.
+
+    } // end class Bicycle
+
+    // PennyFarthing is a subclass of Bicycle
+    class PennyFarthing : Bicycle
+    {
+        // (Penny Farthings are those bicycles with the big front wheel.
+        // They have no gears.)
+
+        // calling parent constructor
+        public PennyFarthing(int startCadence, int startSpeed) :
+            base(startCadence, startSpeed, 0, "PennyFarthing", true)
+        {
+        }
+
+        public override void SetGear(int gear)
+        {
+            gear = 0;
+        }
+
+        public override string ToString()
+        {
+            string result = "PennyFarthing bicycle ";
+            result += base.ToString(); // Calling the base version of the method
+            return reuslt;
+        }
+    }
+
+    // Interfaces only contain signatures of the members, without the implementation.
+    interface IJumpable
+    {
+        void Jump(int meters); // all interface members are implicitly public
+    }
+
+    interface IBreakable
+    {
+        bool Broken { get; } // interfaces can contain properties as well as methods, fields & events
+    }
+
+    // Class can inherit only one other class, but can implement any amount of interfaces
+    class MountainBike : Bicycle, IJumpable, IBreakable
+    {
+        int damage = 0;
+
+        public void Jump(int meters)
+        {
+            damage += meters;
+        }
+
+        public void Broken
+        {
+            get
+            {
+                return damage > 100;
+            }
+        }
+    }
+} // End Namespace
+
+```
+
+## Topics Not Covered
+
+ * Flags
+ * Attributes
+ * Generics (T), Delegates, Func, Actions, lambda expressions
+ * Static properties
+ * Exceptions, Abstraction
+ * LINQ
+ * ASP.NET (Web Forms/MVC/WebMatrix)
+ * Winforms
+ * Windows Presentation Foundation (WPF)
+
+
+
+## Further Reading
+
+ * [DotNetPerls](http://www.dotnetperls.com)
+ * [C# in Depth](http://manning.com/skeet2)
+ * [Programming C#](http://shop.oreilly.com/product/0636920024064.do)
+ * [LINQ](http://shop.oreilly.com/product/9780596519254.do)
+ * [MSDN Library](http://msdn.microsoft.com/en-us/library/618ayhy6.aspx)
+ * [ASP.NET MVC Tutorials](http://www.asp.net/mvc/tutorials)
+ * [ASP.NET Web Matrix Tutorials](http://www.asp.net/web-pages/tutorials)
+ * [ASP.NET Web Forms Tutorials](http://www.asp.net/web-forms/tutorials)
+ * [Windows Forms Programming in C#](http://www.amazon.com/Windows-Forms-Programming-Chris-Sells/dp/0321116208)
+
+
+
+[C# Coding Conventions](http://msdn.microsoft.com/en-us/library/vstudio/ff926074.aspx)
diff --git a/de-de/git-de.html.markdown b/de-de/git-de.html.markdown
new file mode 100644
index 00000000..471c7641
--- /dev/null
+++ b/de-de/git-de.html.markdown
@@ -0,0 +1,374 @@
+---
+category: tool
+tool: git
+contributors:
+    - ["Jake Prather", "http:#github.com/JakeHP"]
+    - ["kultprok", "http://www.kulturproktologie.de"]
+filename: LearnGit.txt
+lang: de-de
+---
+
+Git ist eine verteilte Versions- und Quellcodeverwaltung. 
+
+Es nimmt Schnappschüsse der Projekte, um mit diesen Schnappschüssen verschiedene Versionen unterscheiden und den Quellcode verwalten zu können.
+
+Anmerkung des Übersetzers: Einige englische Begriffe wie *Repository*, *Commit* oder *Head* sind idiomatische Bestandteile im Umgang mit Git. Sie wurden nicht übersetzt.
+
+## Konzepte der Versionsverwaltung
+
+### Was ist Versionsverwaltung?
+
+Eine Versionskontrolle erfasst die Änderungen einer Datei oder eines Verzeichnisses im Verlauf der Zeit.
+
+### Zentrale im Vergleich mit verteilter Versionverwaltung
+
+* Zentrale Versionskontrolle konzentriert sich auf das Synchronisieren, Verfolgen und Sichern von Dateien.
+* Verteilte Versionskontrolle konzentriert sich auf das Teilen der Änderungen. Jede Änderung hat eine eindeutige ID.
+* Verteilte Systeme haben keine vorbestimmte Struktur. Ein SVN-ähnliches, zentrales System wäre mit Git ebenso umsetzbar.
+
+[Weiterführende Informationen](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
+
+### Warum Git?
+
+* Ist offline einsetzbar.
+* Einfache Kollaboration!
+* Branching ist einfach!
+* Merging ist einfach!
+* Git ist schnell.
+* Git ist flexibel.
+
+## Die Architektur von Git
+
+
+### Repository (Repo)
+
+Ein Satz von Dateien, Verzeichnisen, Historieneinträgen, Commits und Heads. Stell es dir wie eine Quellcode-Datenstruktur vor, unter anderem mit der Eigenschaft, dass alle *Elemente* dir Zugriff auf die Revisionshistorie geben.
+
+Ein Repository besteht in Git aus dem .git-Verzeichnis und dem Arbeitsverzeichnis.
+
+### .git-Verzeichnis (Teil des Repositorys)
+
+Das .git-Verzeichnis enth? alle Einstellung, Logs, Branches, den HEAD und mehr.
+[Ausführliche Übersicht](http://gitready.com/advanced/2009/03/23/whats-inside-your-git-directory.html)
+
+### Arbeitsverzeichnis (Teil des Repositorys)
+
+Dies sind die Verzeichnisse und Dateien in deinem Repository.
+
+### Index (Teil des .git-Verzeichnisses)
+
+Der Index ist die die Staging-Area von Git. Es ist im Grunde eine Ebene, die Arbeitsverzeichnis vom Repository trennt. Sie gibt Entwicklern mehr Einfluss darüber, was ins Git-Repository eingeht.
+
+### Commit
+
+Ein Commit ist ein Schnappschuss von Uderungen in deinem Arbeitsverzeichnis. Wenn du zum Beispiel 5 Dateien hinzugefügt und 2 andere entfernt hast, werden diese Änderungen im Commit (Schnappschuss) enthalten sein. Dieser Commit kann dann in andere Repositorys gepusht werden. Oder nicht!
+
+### Branch
+
+Ein Branch, ein Ast oder Zweig, ist im Kern ein Pointer auf den letzten Commit, den du gemacht hast. Während des Commits wird der Pointer automatisch auf Stand gebracht und zeigt dann auf den neuen letzten Commit.
+
+### HEAD und head (Teil des .git-Verzeichnisses)
+
+HEAD ist ein Pointer auf den aktuellen Branch. Ein Repository hat nur einen *aktiven* HEAD. Ein head ist ein Pointer, der auf ein beliebige Zahl von heads zeigt.
+
+### Konzeptionelle Hintergründe
+
+* [Git For Computer Scientists](http://eagain.net/articles/git-for-computer-scientists/)
+* [Git For Designers](http://hoth.entp.com/output/git_for_designers.html)
+
+
+## Befehle
+
+
+### init
+
+Erstelle ein leeres Git-Repository. Die Einstellungen, gespeicherte Informationen und mehr zu diesem Git-Repository werden in einem Verzeichnis namens *.git* angelegt.
+
+```bash
+$ git init
+```
+
+### config
+
+Hiermit werden Einstellungen vorgenommen. Dies kann das Repository, das System selbst oder globale Einstellungen betreffen.
+
+```bash
+# Grundlegende Config-Variablen ausgeben und setzen
+$ git config --global user.email
+$ git config --global user.name
+
+$ git config --global user.email "MyEmail@Zoho.com"
+$ git config --global user.name "My Name"
+```
+
+[Mehr über git config](http://git-scm.com/docs/git-config)
+
+### help
+
+Schnellzugriff auf extrem detaillierte Anleitungen zu allen Befehlen. Oder als Erinnerung zu semantischen Eigenheiten.
+
+```bash
+# Übersicht gängiger Befehle
+$ git help
+
+# Übersicht aller verfügbaren Befehle
+$ git help -a
+
+# Befehlspezifische Hilfe - Bedienungsanleitung
+# git help <gesuchter_befehl>
+$ git help add
+$ git help commit
+$ git help init
+```
+
+### status
+
+Zeigt die Unterschiede zwischen Index (im Grunde dein Arbeitsverzeichnis/-repository) und dem aktuellen HEAD an.
+
+
+```bash
+# Zeigt den Branch, nicht-verfolgte Dateien, Uderungen und andere Unterschiede an
+$ git status
+
+# Anderes Wissenswertes über git status anzeigen
+$ git help status
+```
+
+### add
+
+Hinzufügen von Dateien zum Arbeitsverzeichnis/-repository. Wenn du neue Dateien nicht mit *git add* zum Arbeitsverzeichnis hinzufügst, werden sie nicht in den Commit aufgenommen!
+
+```bash
+# Fügt eine Datei deinem aktuellen Arbeitsverzeichnis hinzu
+$ git add HelloWorld.java
+
+# Fügt eine Datei aus einem verschachtelten Verzeichnis hinzu
+$ git add /path/to/file/HelloWorld.c
+
+# Reguläre Ausdrücke werden unterstützt!
+$ git add ./*.java
+```
+
+### branch
+
+Verwalte alle Branches. Du kannst sie mit diesem Befehl ansehen, bearbeiten, neue erschaffen oder löschen.
+
+```bash
+# Liste alle bestehenden Branches und Remotes auf
+$ git branch -a
+
+# Erstelle einen neuen Branch
+$ git branch myNewBranch
+
+# Lösche einen Branch
+$ git branch -d myBranch
+
+# Benenne einen Branch um
+# git branch -m <oldname> <newname>
+$ git branch -m myBranchName myNewBranchName
+
+# Ändere die Beschreibung eines Branchs
+$ git branch myBranchName --edit-description
+```
+
+### checkout
+
+Bringt alle Dateien im Arbeitsverzeichnis auf den Stand des Index oder des angegebenen Branches.
+
+```bash
+# Ein Repo auschecken - wenn nicht anders angegeben ist das der master
+$ git checkout
+# Einen bestimmten Branch auschecken
+$ git checkout branchName
+# Erstelle einen neuen Branch und wechsle zu ihm. Wie: "git branch <name>; git checkout <name>"
+$ git checkout -b newBranch
+```
+
+### clone
+
+Ein bestehendes Repository in ein neues Verzeichnis klonen oder kopieren. Es fügt außerdem für hedes geklonte Repo remote-tracking Branches hinzu. Du kannst auf diese Remote-Branches pushen.
+
+```bash
+# Klone learnxinyminutes-docs
+$ git clone https://github.com/adambard/learnxinyminutes-docs.git
+```
+
+### commit
+
+Speichert die aktuellen Inhalte des Index in einen neuen *Commit*. Dieser Commit enthält alle Änderungen und eine vom Benutzer erstellte Beschreibung der Änderungen.
+
+```bash
+# Commit mit Beschreibung erstellen.
+$ git commit -m "Added multiplyNumbers() function to HelloWorld.c"
+```
+
+### diff
+
+Zeigt die Unterschiede zwischen Dateien von Arbeitsverzeichnisse, dem Index und Commits an.
+
+```bash
+# Unterschiede zwischen deinem Arbeitsverzeichnis und dem Index anzeigen
+$ git diff
+
+# Unterschiede zwischen dem Index und dem aktuellsten Commit anzeigen
+$ git diff --cached
+
+# Unterschiede zwischen deinem Arbeitsverzeichnis und dem aktuellsten Commit anzeigen
+$ git diff HEAD
+```
+
+### grep
+
+Schnell ein Repository durchsuchen.
+
+Optionale Einstellungen:
+
+```bash
+# Vielen Dank an Travis Jeffery für die Hinweise.
+# Zeilennummerierung in grep-Suchergebnissen
+$ git config --global grep.lineNumber true
+
+# Suchergebnisse lesbarer gestalten, auch Gruppierungen sind möglich
+$ git config --global alias.g "grep --break --heading --line-number"
+```
+
+```bash
+# Suche nach "variableName" in allen java-Dateien
+$ git grep 'variableName' -- '*.java'
+
+# Suche nach eine Zeile, die "arrayListName" und  "add" oder "remove" enthält
+$ git grep -e 'arrayListName' --and \( -e add -e remove \) 
+```
+
+Google ist dein Freund; für mehr Beispiele:
+[Git Grep Ninja](http://travisjeffery.com/b/2012/02/search-a-git-repo-like-a-ninja)
+
+### log
+
+Zeige Commits für das Repository an.
+
+```bash
+# Zeige alle Commits
+$ git log
+
+# Zeige die Anzahl n an Commits
+$ git log -n 10
+
+# Zeige nur Merges an
+$ git log --merges
+```
+
+### merge
+
+*Merge*, also verschmelze, alle Änderungen von externen Commits in den aktuellen Branch.
+
+```bash
+# Merge den angegebenen Branch in den aktuellen.
+$ git merge branchName
+
+# Erstelle immer einen Merge-Commit.
+$ git merge --no-ff branchName
+```
+
+### mv
+
+Eine Datei umbenennen oder verschieben.	
+
+```bash
+# Umbenennen
+$ git mv HelloWorld.c HelloNewWorld.c
+
+# Verschieben
+$ git mv HelloWorld.c ./new/path/HelloWorld.c
+
+# Umbenennung oder Verschieben erzwingen
+# "existingFile" besteht schon im Verzeichnis, wird überschrieben mit "myFile"
+$ git mv -f myFile existingFile
+```
+
+### pull
+
+Führe einen Pull, zieht alle Daten, eines Repositorys und f?? einen Merge mit einem anderen Branch durch.
+
+```bash
+# Update deines lokalen Repos, indem ein Merge der neuen Uderungen
+# von den remote-liegenden "origin"- und "master"-Branches durchgef?? wird.
+# git pull <remote> <branch>
+# git pull => impliziter Verweis auf origin und master
+$ git pull origin master
+
+# F?? einen Merge von Uderungen eines remote-Branch und ein Rebase
+# des Branch-Commits im lokalen Repo durch. Wie: pull <remote> <branch>, git rebase <branch>"
+$ git pull origin master --rebase
+```
+
+### push
+
+Führe einen Push, ein Hochladen, und einen Merge von Änderungen eines remote-Branch mit einem Branch aus.
+
+```bash
+# Führe Push und Merge von Änderungen des lokalen Repo zu einem
+# remote-Branch namens "origin" und dem "master"-Branch aus.
+# git push <remote> <branch>
+# git push => impliziter Verweis auf => git push origin master
+$ git push origin master
+```
+
+### rebase (mit Vorsicht einsetzen) 
+
+Nimm alle Änderungen, die in einem Branch durch Commits vorgenommen wurden, und übertrage sie auf einen anderen Branch. Achtung: Führe keinen Rebase von Commits durch, die auf ein öffentliches Repo gepusht wurden.
+
+```bash
+# Rebase "experimentBranch" in den "master"-Branch
+# git rebase <basisbranch> <themenbranch>
+$ git rebase master experimentBranch
+```
+
+[Weiterführende Informationen](http://git-scm.com/book/en/Git-Branching-Rebasing)
+
+### reset (mit Vorsicht einsetzen)
+
+Setze den aktuellen HEAD auf den angegebenen Zustand zurück. So können Merges, Pulls, Commits, Hinzufügungen und andere Änderungen rückgängig gemacht werden. Es ist ein hervorragender Befehl, aber auch sehr gefährlich, wenn du nicht weißt, was du tust.
+
+```bash
+# Setze die Staging-Area zurück, um dem letzten Commit zu entsprechen (das Verzeichnis bleibt unberührt)
+$ git reset
+
+# Setze die Staging-Area zurück, um dem letzten Commit zu entsprechen und überschreibe das Arbeitsverzeichnis
+$ git reset --hard
+
+# Bewegt die Spitze des Branches zu dem angegebenen Commit (das Verzeichnis bleibt unber??)
+# Alle Uderungen bleiben im Verzeichnis erhalten
+$ git reset 31f2bb1
+
+# Bewegt die Spitze des Branches zurück zu dem angegebenen Commit
+# und gleicht die Arbeitsverzeichnisse ab (löscht nicht vom Commit erfasste Änderungen und alle Commits,
+# die dem angegebenen Commit folgen).
+$ git reset --hard 31f2bb1
+```
+
+### rm
+
+Das Gegenteil von *git add*. *git rm* löscht Dateien vom Arbeitsverzeichnis.
+
+```bash
+# Entferne HelloWorld.c
+$ git rm HelloWorld.c
+
+# Entferne eine Datei aus einem verschachtelten Verzeichnis
+$ git rm /pather/to/the/file/HelloWorld.c
+```
+
+## Weiterführende Informationen
+
+* [tryGit - A fun interactive way to learn Git.](http://try.github.io/levels/1/challenges/1)
+
+* [git-scm - Video Tutorials](http://git-scm.com/videos)
+
+* [git-scm - Documentation](http://git-scm.com/docs)
+
+* [Atlassian Git - Tutorials & Workflows](https://www.atlassian.com/git/)
+
+* [SalesForce Cheat Sheet](https://na1.salesforce.com/help/doc/en/salesforce_git_developer_cheatsheet.pdf)
+
+* [GitGuys](http://www.gitguys.com/)
diff --git a/de-de/python-de.html.markdown b/de-de/python-de.html.markdown
new file mode 100644
index 00000000..7462d5f6
--- /dev/null
+++ b/de-de/python-de.html.markdown
@@ -0,0 +1,486 @@
+---
+language: python
+contributors:
+    - ["Louie Dinh", "http://ldinh.ca"]
+    - ["kultprok", "http:/www.kulturproktologie.de"]
+filename: learnpython-de.py
+lang: de-de
+---
+
+Anmerkungen des ursprünglichen Autors:
+Python wurde in den frühen Neunzigern von Guido van Rossum entworfen. Es ist heute eine der beliebtesten Sprachen. Ich habe mich in Python wegen seiner syntaktischen Übersichtlichkeit verliebt. Eigentlich ist es ausführbarer Pseudocode.
+
+Feedback ist herzlich willkommen! Ihr erreicht mich unter [@louiedinh](http://twitter.com/louiedinh) oder louiedinh [at] [google's email service]
+
+Hinweis: Dieser Beitrag bezieht sich besonders auf Python 2.7, er sollte aber auf Python 2.x anwendbar sein. Haltet Ausschau nach einem Rundgang durch Python 3, der bald erscheinen soll.
+
+```python
+# Einzeilige Kommentare beginnen mit einer Raute (Doppelkreuz)
+""" Mehrzeilige Strings werden mit 
+    drei '-Zeichen geschrieben und werden
+    oft als Kommentare genutzt.
+"""
+
+####################################################
+## 1. Primitive Datentypen und Operatoren
+####################################################
+
+# Die Zahlen
+3 #=> 3
+
+# Mathematik funktioniert so, wie man das erwartet
+1 + 1 #=> 2
+8 - 1 #=> 7
+10 * 2 #=> 20
+35 / 5 #=> 7
+
+# Division ist ein wenig kniffliger. Ganze Zahlen werden ohne Rest dividiert
+# und das Ergebnis wird automatisch abgerundet.
+5 / 2 #=> 2
+
+# Um das zu ändern, müssen wir Gleitkommazahlen einführen und benutzen
+2.0     # Das ist eine Gleitkommazahl
+11.0 / 4.0 #=> 2.75 Ahhh...schon besser
+
+# Rangfolge wird mit Klammern erzwungen
+(1 + 3) * 2 #=> 8
+
+# Boolesche Ausdrücke sind primitive Datentypen
+True
+False
+
+# Mit not wird negiert
+not True #=> False
+not False #=> True
+
+# Gleichheit ist ==
+1 == 1 #=> True
+2 == 1 #=> False
+
+# Ungleichheit ist !=
+1 != 1 #=> False
+2 != 1 #=> True
+
+# Ein paar weitere Vergleiche
+1 < 10 #=> True
+1 > 10 #=> False
+2 <= 2 #=> True
+2 >= 2 #=> True
+
+# Vergleiche können verknüpft werden!
+1 < 2 < 3 #=> True
+2 < 3 < 2 #=> False
+
+# Strings werden mit " oder ' gebildet
+"Das ist ein String."
+'Das ist auch ein String.'
+
+# Strings können addiert werden!
+"Hello " + "world!" #=> "Hello world!"
+
+# Ein String kann wie eine Liste von Zeichen verwendet werden
+"Das ist ein String"[0] #=> 'D'
+
+# Mit % können Strings formatiert werden, etwa so:
+"%s können %s werden" % ("Strings", "interpoliert")
+
+# Ein modernerer Weg, um Strings zu formatieren, ist die format-Methode.
+# Diese Methode wird bevorzugt
+"{0} können {1} werden".format("Strings", "formatiert")
+# Wir können Schlüsselwörter verwenden, wenn wir nicht abzählen wollen.
+"{name} will {food} essen".format(name="Bob", food="Lasagne")
+
+# None ist ein Objekt
+None #=> None
+
+# Verwendet nicht das Symbol für Gleichheit `==`, um Objekte mit None zu vergleichen
+# Benutzt stattdessen `is`
+"etc" is None #=> False
+None is None  #=> True
+
+# Der 'is'-Operator testet Objektidentität. Das ist nicht
+# sehr nützlich, wenn wir mit primitiven Datentypen arbeiten, aber
+# sehr nützlich bei Objekten.
+
+# None, 0, und leere Strings/Listen werden alle als False bewertet.
+# Alle anderen Werte sind True
+0 == False  #=> True
+"" == False #=> True
+
+
+####################################################
+## 2. Variablen und Collections
+####################################################
+
+# Textausgabe ist sehr einfach
+print "Ich bin Python. Schön, dich kennenzulernen!"
+
+
+# Es gibt keinen Grund, Variablen vor der Zuweisung zu deklarieren.
+some_var = 5    # kleinschreibung_mit_unterstrichen entspricht der Norm
+some_var #=> 5
+
+# Das Ansprechen einer noch nicht deklarierte Variable löst eine Exception aus.
+# Unter "Kontrollstruktur" kann noch mehr über
+# Ausnahmebehandlung erfahren werden.
+some_other_var  # Löst einen NameError aus
+
+# if kann als Ausdruck verwendet werden
+"yahoo!" if 3 > 2 else 2 #=> "yahoo!"
+
+# Listen speichern Sequenzen
+li = []
+# Wir können mit einer bereits gefüllten Liste anfangen
+other_li = [4, 5, 6]
+
+# append fügt Daten am Ende der Liste ein
+li.append(1)    #li ist jetzt [1]
+li.append(2)    #li ist jetzt [1, 2]
+li.append(4)    #li ist jetzt [1, 2, 4]
+li.append(3)    #li ist jetzt [1, 2, 4, 3]
+# Vom Ende der Liste mit pop entfernen
+li.pop()        #=> 3 und li ist jetzt [1, 2, 4]
+# und dann wieder hinzufügen
+li.append(3)    # li ist jetzt wieder [1, 2, 4, 3].
+
+# Greife auf Listen wie auf Arrays zu
+li[0] #=> 1
+# Das letzte Element ansehen
+li[-1] #=> 3
+
+# Bei Zugriffen außerhal der Liste kommt es jedoch zu einem IndexError
+li[4] # Raises an IndexError
+
+# Wir können uns Ranges mit Slice-Syntax ansehen
+li[1:3] #=> [2, 4]
+# Den Anfang auslassen
+li[2:] #=> [4, 3]
+# Das Ende auslassen
+li[:3] #=> [1, 2, 4]
+
+# Ein bestimmtes Element mit del aus der Liste entfernen
+del li[2] # li ist jetzt [1, 2, 3]
+
+# Listen können addiert werden
+li + other_li #=> [1, 2, 3, 4, 5, 6] - Hinweis: li und other_li werden in Ruhe gelassen
+
+# Listen mit extend verknüpfen
+li.extend(other_li) # Jetzt ist li [1, 2, 3, 4, 5, 6]
+
+# Mit in auf Existenz eines Elements prüfen
+1 in li #=> True
+
+# Die Länge der Liste mit len ermitteln
+len(li) #=> 6
+
+
+# Tupel sind wie Listen, nur unveränderlich.
+tup = (1, 2, 3)
+tup[0] #=> 1
+tup[0] = 3  # Löst einen TypeError aus
+
+# Wir können all diese Listen-Dinge auch mit Tupeln anstellen
+len(tup) #=> 3
+tup + (4, 5, 6) #=> (1, 2, 3, 4, 5, 6)
+tup[:2] #=> (1, 2)
+2 in tup #=> True
+
+# Wir können Tupel (oder Listen) in Variablen entpacken
+a, b, c = (1, 2, 3)     # a ist jetzt 1, b ist jetzt 2 und c ist jetzt 3
+# Tuple werden standardmäßig erstellt, wenn wir uns die Klammern sparen
+d, e, f = 4, 5, 6
+# Es ist kinderleicht zwei Werte zu tauschen
+e, d = d, e     # d is now 5 and e is now 4
+
+
+# Dictionarys (Wörterbucher) speichern Key-Value-Paare
+empty_dict = {}
+# Hier ein gefülltes Wörterbuch
+filled_dict = {"one": 1, "two": 2, "three": 3}
+
+# Wir können Einträge mit [] nachschlagen
+filled_dict["one"] #=> 1
+
+# So holen wir alle Keys (Schlüssel) als Liste
+filled_dict.keys() #=> ["three", "two", "one"]
+# Hinweis - Die Reihenfolge von Schlüsseln in der Liste ist nicht garantiert.
+# Einzelne Resultate können anders angeordnet sein.
+
+# Alle Values (Werte) als Liste
+filled_dict.values() #=> [3, 2, 1]
+# Hinweis - Hier gelten dieselben Einschränkungen für die Reihenfolge wie bei Schlüsseln.
+
+# Das Vorhandensein eines Schlüssels im Wörterbuch mit in prüfen
+"one" in filled_dict #=> True
+1 in filled_dict #=> False
+
+# Einen nicht vorhandenenen Schlüssel zu suchen, löst einen KeyError aus
+filled_dict["four"] # KeyError
+
+# Mit der get-Methode verhindern wir das
+filled_dict.get("one") #=> 1
+filled_dict.get("four") #=> None
+# Die get-Methode unterstützt auch ein Standardargument, falls der Wert fehlt
+filled_dict.get("one", 4) #=> 1
+filled_dict.get("four", 4) #=> 4
+
+# Die setdefault-Methode ist ein sicherer Weg, ein neues Schlüssel-Wert-Paar anzulegen
+filled_dict.setdefault("five", 5) #filled_dict["five"] wird auf 5 gesetzt
+filled_dict.setdefault("five", 6) #filled_dict["five"] ist noch immer 5
+
+
+# Sets speichern Mengen
+empty_set = set()
+# Initialisieren wir ein Set mit ein paar Werten
+some_set = set([1,2,2,3,4]) # some_set ist jetzt set([1, 2, 3, 4])
+
+# Seit Python 2.7 kann {} benutzt werden, um ein Set zu erstellen
+filled_set = {1, 2, 2, 3, 4} # => {1 2 3 4}
+
+# Mehr Elemente hinzufügen
+filled_set.add(5) # filled_set is now {1, 2, 3, 4, 5}
+
+# Schnittmengen werden mit & gebildet
+other_set = {3, 4, 5, 6}
+filled_set & other_set #=> {3, 4, 5}
+
+# Mengen werden mit | vereinigt
+filled_set | other_set #=> {1, 2, 3, 4, 5, 6}
+
+# Die Differenz einer Menge mit - bilden
+{1,2,3,4} - {2,3,5} #=> {1, 4}
+
+# Auf Vorhandensein von Elementen mit in prüfen
+2 in filled_set #=> True
+10 in filled_set #=> False
+
+
+####################################################
+## 3. Kontrollstruktur
+####################################################
+
+# Erstellen wir mal eine Variable
+some_var = 5
+
+# Hier eine if-Anweisung. Die Einrückung ist in Python wichtig!
+# gibt "some_var ist kleiner als 10" aus
+if some_var > 10:
+    print "some_var ist viel größer als 10."
+elif some_var < 10:    # Dieser elif-Absatz ist optional.
+    print "some_var ist kleiner als 10."
+else:           # Das hier ist auch optional.
+    print "some_var ist tatsächlich 10."
+
+
+"""
+For-Schleifen iterieren über Listen
+Ausgabe:
+    hund ist ein Säugetier
+    katze ist ein Säugetier
+    maus ist ein Säugetier
+"""
+for animal in ["hund", "katze", "maus"]:
+    # Wir können Strings mit % formatieren
+    print "%s  ist ein Säugetier" % animal
+    
+"""
+`range(Zahl)` gibt eine null-basierte Liste bis zur angegebenen Zahl wieder
+Ausgabe:
+    0
+    1
+    2
+    3
+"""
+for i in range(4):
+    print i
+
+"""
+While-Schleifen laufen, bis eine Bedingung erfüllt ist.
+Ausgabe:
+    0
+    1
+    2
+    3
+"""
+x = 0
+while x < 4:
+    print x
+    x += 1  # Kurzform für x = x + 1
+
+# Ausnahmebehandlung mit einem try/except-Block
+
+# Funktioniert in Python 2.6 und höher:
+try:
+    # Mit raise wird ein Fehler ausgegeben
+    raise IndexError("Das hier ist ein Index-Fehler")
+except IndexError as e:
+    pass    # Pass ist nur eine no-op. Normalerweise würden wir hier den Fehler klären.
+
+
+####################################################
+## 4. Funktionen
+####################################################
+
+# Mit def neue Funktionen erstellen
+def add(x, y):
+    print "x ist %s und y ist %s" % (x, y)
+    return x + y    # Werte werden mit return zurückgegeben
+
+# Funktionen mit Parametern aufrufen
+add(5, 6) #=> Ausgabe ist "x ist 5 und y ist 6" und gibt 11 zurück
+
+# Ein anderer Weg des Funktionsaufrufs sind Schlüsselwort-Argumente
+add(y=6, x=5)   # Schlüsselwörter können in beliebiger Reihenfolge übergeben werden.
+
+# Wir können Funktionen mit beliebiger Anzahl von # Positionsargumenten definieren
+def varargs(*args):
+    return args
+
+varargs(1, 2, 3) #=> (1,2,3)
+
+
+# Wir können auch Funktionen mit beliebiger Anzahl
+# Schlüsselwort-Argumenten definieren
+def keyword_args(**kwargs):
+    return kwargs
+
+# Rufen wir es mal auf, um zu sehen, was passiert
+keyword_args(big="foot", loch="ness") #=> {"big": "foot", "loch": "ness"}
+
+# Wir können beides gleichzeitig machem, wenn wir wollen
+def all_the_args(*args, **kwargs):
+    print args
+    print kwargs
+"""
+all_the_args(1, 2, a=3, b=4) Ausgabe:
+    (1, 2)
+    {"a": 3, "b": 4}
+"""
+
+# Beim Aufruf von Funktionen können wir das Gegenteil von varargs/kwargs machen!
+# Wir benutzen dann *, um Tupel auszuweiten, und ** für kwargs.
+args = (1, 2, 3, 4)
+kwargs = {"a": 3, "b": 4}
+all_the_args(*args) # äquivalent zu foo(1, 2, 3, 4)
+all_the_args(**kwargs) # äquivalent zu foo(a=3, b=4)
+all_the_args(*args, **kwargs) # äquivalent zu  foo(1, 2, 3, 4, a=3, b=4)
+
+# Python hat First-Class-Funktionen
+def create_adder(x):
+    def adder(y):
+        return x + y
+    return adder
+
+add_10 = create_adder(10)
+add_10(3) #=> 13
+
+# Es gibt auch anonyme Funktionen
+(lambda x: x > 2)(3) #=> True
+
+# Es gibt auch Funktionen höherer Ordnung als Built-Ins
+map(add_10, [1,2,3]) #=> [11, 12, 13]
+filter(lambda x: x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
+
+# Wir können bei map- und filter-Funktionen auch List Comprehensions einsetzen
+[add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5] #=> [6, 7]
+
+####################################################
+## 5. Klassen
+####################################################
+
+# Wir bilden die Unterklasse eines Objekts, um Klassen zu erhalten.
+class Human(object):
+
+    # Ein Klassenattribut. Es wird von allen Instanzen einer Klasse geteilt
+    species = "H. sapiens"
+
+    # Ein simpler Konstruktor
+    def __init__(self, name):
+        # Wir weisen das Argument name dem name-Attribut der Instanz zu
+        self.name = name
+
+    # Eine Instanzmethode. Alle Methoden erhalten self als erstes Argument.
+    def say(self, msg):
+       return "%s: %s" % (self.name, msg)
+
+    # Eine Klassenmethode wird von allen Instanzen geteilt.
+    # Sie werden mit der aufrufenden Klasse als erstem Argument aufgerufen
+    @classmethod
+    def get_species(cls):
+        return cls.species
+
+    # Eine statische Methode wird ohne Klasse oder Instanz aufgerufen
+    @staticmethod
+    def grunt():
+        return "*grunt*"
+
+
+# Eine Instanz einer Klasse erstellen
+i = Human(name="Ian")
+print i.say("hi")     # gibt "Ian: hi" aus
+
+j = Human("Joel")
+print j.say("hello")  #gibt "Joel: hello" aus
+
+# Rufen wir mal unsere Klassenmethode auf
+i.get_species() #=> "H. sapiens"
+
+# Ändern wir mal das gemeinsame Attribut
+Human.species = "H. neanderthalensis"
+i.get_species() #=> "H. neanderthalensis"
+j.get_species() #=> "H. neanderthalensis"
+
+# Aufruf der statischen Methode
+Human.grunt() #=> "*grunt*"
+
+
+####################################################
+## 6. Module
+####################################################
+
+# Wir können Module importieren
+import math
+print math.sqrt(16) #=> 4
+
+# Wir können auch nur spezielle Funktionen eines Moduls importieren
+from math import ceil, floor
+print ceil(3.7)  #=> 4.0
+print floor(3.7) #=> 3.0
+
+# Wir können auch alle Funktionen eines Moduls importieren
+# Warnung: Dies wird nicht empfohlen
+from math import *
+
+# Wir können Modulnamen abkürzen
+import math as m
+math.sqrt(16) == m.sqrt(16) #=> True
+
+# Module sind in Python nur gewöhnliche Dateien. Wir
+# können unsere eigenen schreiben und importieren. Der Name des 
+# Moduls ist der Dateiname.
+
+# Wir können auch die Funktionen und Attribute eines
+# Moduls herausfinden.
+import math
+dir(math)
+
+
+```
+
+## Lust auf mehr?
+
+### Kostenlos online (Englisch)
+
+* [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+* [Dive Into Python](http://www.diveintopython.net/)
+* [The Official Docs](http://docs.python.org/2.6/)
+* [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
+* [Python Module of the Week](http://pymotw.com/2/)
+
+### Totholz (Englisch)
+
+* [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
+* [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
+* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)
+
diff --git a/es-es/c-es.html.markdown b/es-es/c-es.html.markdown
index b109f761..5d3aae0c 100644
--- a/es-es/c-es.html.markdown
+++ b/es-es/c-es.html.markdown
@@ -284,7 +284,7 @@ for (xx=0; xx<20; xx++) {
 // impredecibles
 printf("%d\n", *(my_ptr + 21)); // => Prints who-knows-what?
 
-// Cuando hallas acabado con el bloque de memoría malloc, necesitas 
+// Cuando hayas acabado con el bloque de memoría malloc, necesitas 
 // liberarlo o sino nadie más podrá usarlo hasta que tu programa se cierre
 free(my_ptr);
 
diff --git a/es-es/coffeescript-es.html.markdown b/es-es/coffeescript-es.html.markdown
new file mode 100644
index 00000000..78bb9be5
--- /dev/null
+++ b/es-es/coffeescript-es.html.markdown
@@ -0,0 +1,57 @@
+---
+language: coffeescript
+lang: es-es
+contributors:
+  - ["Tenor Biel", "http://github.com/L8D"]
+translators:
+  - ["Pablo Elices", "http://github.com/pabloelices"]
+filename: coffeescript-es.coffee
+---
+
+``` coffeescript
+# CoffeeScript es un lenguaje hipster.
+# Tiene convenciones de muchos lenguajes modernos.
+# Los comentarios son como en Ruby y Python, usan almohadillas.
+
+###
+Los comentarios en bloque son como estos, y se traducen directamente a '/*' y '*/'
+para el código JavaScript resultante.
+
+Deberías entender la mayor parte de la semántica de JavaScript antes de continuar.
+###
+
+# Asignación:
+number   = 42 #=> var number = 42;
+opposite = true #=> var opposite = true;
+
+# Condiciones:
+number = -42 if opposite #=> if(opposite) { number = -42; }
+
+# Funciones:
+square = (x) -> x * x #=> var square = function(x) { return x * x; }
+
+# Rangos:
+list = [1..5] #=> var list = [1, 2, 3, 4, 5];
+
+# Objetos:
+math =
+  root:   Math.sqrt
+  square: square
+  cube:   (x) -> x * square x
+#=> var math = {
+#  "root": Math.sqrt,
+#  "square": square,
+#  "cube": function(x) { return x * square(x); }
+#}
+
+# Símbolos:
+race = (winner, runners...) ->
+  print winner, runners
+
+# Existencia:
+alert "I knew it!" if elvis?
+#=> if(typeof elvis !== "undefined" && elvis !== null) { alert("I knew it!"); }
+
+# Colecciones por comprensión:
+cubes = (math.cube num for num in list) #=> ...
+```
diff --git a/fr-fr/coffeescript-fr.html.markdown b/fr-fr/coffeescript-fr.html.markdown
new file mode 100644
index 00000000..c66b7be0
--- /dev/null
+++ b/fr-fr/coffeescript-fr.html.markdown
@@ -0,0 +1,58 @@
+---
+language: coffeescript
+contributors:
+  - ["Tenor Biel", "http://github.com/L8D"]
+translators:
+  - ["Geoffrey Roguelon", "https://github.com/GRoguelon"]
+lang: fr-fr
+filename: coffeescript-fr.coffee
+---
+
+``` coffeescript
+# CoffeeScript est un langage préprocesseur, il permet de générer du Javascript.
+# Il suit les tendances de certains langages récents.
+# Par exemple, les commentaires se définissent comme en Ruby ou en Python.
+
+###
+Ceci est un bloc de commentaires
+il est converti directement avec '/ *' et '* /'
+pour correspondre aux commentaires Javascript
+
+Vous devez comprendre la syntaxe du langage JavaScript pour continuer.
+###
+
+# Affectation :
+number   = 42 #=> var number = 42;
+opposite = true #=> var opposite = true;
+
+# Structures de contrôle :
+number = -42 if opposite #=> if(opposite) { number = -42; }
+
+# Fonctions :
+square = (x) -> x * x #=> var square = function(x) { return x * x; }
+
+# Intervals :
+list = [1..5] #=> var list = [1, 2, 3, 4, 5];
+
+# Objets :
+math =
+  root:   Math.sqrt
+  square: square
+  cube:   (x) -> x * square x
+#=> var math = {
+#  "root": Math.sqrt,
+#  "square": square,
+#  "cube": function(x) { return x * square(x); }
+#}
+
+# Liste d'arguments variables :
+race = (winner, runners...) ->
+  print winner, runners
+
+# Existance :
+alert "I knew it!" if elvis?
+#=> if(typeof elvis !== "undefined" && elvis !== null) { alert("I knew it!"); }
+
+# Lecture d'un tableau :
+cubes = (math.cube num for num in list) #=> ...
+```
diff --git a/fr-fr/ruby-fr.html.markdown b/fr-fr/ruby-fr.html.markdown
new file mode 100644
index 00000000..3060bd75
--- /dev/null
+++ b/fr-fr/ruby-fr.html.markdown
@@ -0,0 +1,411 @@
+---
+language: ruby
+filename: learnruby-fr.rb
+contributors:
+  - ["David Underwood", "http://theflyingdeveloper.com"]
+  - ["Joel Walden", "http://joelwalden.net"]
+  - ["Luke Holder", "http://twitter.com/lukeholder"]
+  - ["Tristan Hume", "http://thume.ca/"]
+  - ["Nick LaMuro", "https://github.com/NickLaMuro"]
+translators:
+  - ["Geoffrey Roguelon", "https://github.com/GRoguelon"]
+  - ["Nami-Doc", "https://github.com/Nami-Doc"]
+lang: fr-fr
+---
+
+```ruby
+# Ceci est un commentaire
+
+=begin
+Ceci est un commentaire multiligne
+Personne ne les utilise
+Vous devriez en faire de même
+=end
+
+# Tout d'abord : Tout est un objet.
+
+# Les nombres sont des objets
+
+3.class #=> Fixnum
+
+3.to_s #=> "3"
+
+# Les opérateurs de base
+1 + 1 #=> 2
+8 - 1 #=> 7
+10 * 2 #=> 20
+35 / 5 #=> 7
+
+# Les opérateurs sont juste des raccourcis
+# pour appeler une méthode sur un objet
+1.+(3) #=> 4
+10.* 5 #=> 50
+
+# Les valeurs spéciales sont des objets
+nil # Nul
+true # Vrai
+false # Faux
+
+nil.class #=> NilClass
+true.class #=> TrueClass
+false.class #=> FalseClass
+
+# Égalité
+1 == 1 #=> true
+2 == 1 #=> false
+
+# Inégalité
+1 != 1 #=> false
+2 != 1 #=> true
+!true  #=> false
+!false #=> true
+
+# à part false lui-même, nil est la seule autre valeur 'false'
+
+!nil   #=> true
+!false #=> true
+!0     #=> false
+
+# Plus de comparaisons
+1 < 10 #=> true
+1 > 10 #=> false
+2 <= 2 #=> true
+2 >= 2 #=> true
+
+# Les chaînes de caractères sont des objets
+
+'Je suis une chaîne de caractères'.class #=> String
+"Je suis également une chaîne de caractères".class #=> String
+
+placeholder = "utiliser l'interpolation de chaîne de caractères"
+"Je peux #{placeholder} quand j'utilise les guillemets"
+#=> "Je peux utiliser l'interpolation de chaîne de caractères quand j'utilise les guillemets"
+
+# Affichez un message
+puts "J'affiche à l'écran!"
+
+# Variables
+x = 25 #=> 25
+x #=> 25
+
+# Notez que l'affectation retourne la valeur affectée.
+# Cela signifie que vous pouvez affecter plusieurs fois de suite :
+
+x = y = 10 #=> 10
+x #=> 10
+y #=> 10
+
+# Par convention, utilisez la notation underscore
+# pour nommer les variables
+snake_case = true
+
+# Utilisez des noms de variable explicites
+path_to_project_root = '/nom/correct/'
+path = '/mauvais/nom/'
+
+# Symboles (aussi des objets)
+# Les symboles sont immuables, constants,
+# réutilisables et représentés en interne
+# par une valeur entière. Ils sont souvent
+# utilisés à la place des chaînes de caractères
+# pour transmettre efficacement des valeurs
+# spécifiques ou significatives
+
+:pending.class #=> Symbol
+
+status = :pending
+
+status == :pending #=> true
+
+status == 'pending' #=> false
+
+status == :approved #=> false
+
+# Tableaux
+
+# Ceci est un tableau
+array = [1, 2, 3, 4, 5] #=> [1, 2, 3, 4, 5]
+
+# Les tableaux contiennent différents types d'élément.
+
+[1, "hello", false] #=> [1, "hello", false]
+
+# Les tableaux peuvent être indexés
+# Du début
+array[0] #=> 1
+array[12] #=> nil
+
+# Comme les opérateurs, la syntaxe [var] est juste un raccourci
+# pour appeler la méthode [] d'un objet
+array.[] 0 #=> 1
+array.[] 12 #=> nil
+
+# Depuis la fin
+array[-1] #=> 5
+
+# Avec un index de début et de fin
+array[2, 4] #=> [3, 4, 5]
+
+# Ou avec un intervalle
+array[1..3] #=> [2, 3, 4]
+
+# Ajoutez un élément au tableau comme ceci
+array << 6 #=> [1, 2, 3, 4, 5, 6]
+
+# Les Hash sont des dictionnaires Ruby contenant des paires de clé/valeur.
+# Les Hash sont délimitées par des accolades :
+hash = {'color' => 'green', 'number' => 5}
+
+hash.keys #=> ['color', 'number']
+
+# Les Hash retournent la valeur
+# en utilisant la clé associée à la valeur :
+hash['color'] #=> 'green'
+hash['number'] #=> 5
+
+# Recherchez une clé inexistante dans une Hash retourne nil :
+hash['nothing here'] #=> nil
+
+# Depuis Ruby 1.9, Une syntaxe spécifique est apparue
+# en utilisant les symboles comme clés :
+
+new_hash = { defcon: 3, action: true}
+
+new_hash.keys #=> [:defcon, :action]
+
+# Astuce : Les tableaux et les Hash sont dénombrables
+# Ils partagent un certain nombre de méthodes pratiques
+# telle que each, map, count, etc...
+
+# Structures de contrôle
+
+if true
+  "si instruction"
+elsif false
+  "autrement si, facultatif"
+else
+  "autrement, également facultatif"
+end
+
+for compteur in 1..5
+  puts "itération #{compteur}"
+end
+#=> itération 1
+#=> itération 2
+#=> itération 3
+#=> itération 4
+#=> itération 5
+
+# CEPENDANT, l'usage de la boucle for est très rare.
+# À la place, utilisez la méthode "each"
+# et passez lui un bloc de code.
+# Un bloc de code est un ensemble d'instructions
+# que vous pouvez passer à une methode comme "each".
+# Les blocs sont similaires aux lambdas, aux fonctions anonymes
+# ou encore aux closures dans d'autres langages.
+#
+# La méthode "each" exécute le bloc de code
+# pour chaque élément de l'intervalle d'éléments.
+# Le bloc de code passe un paramètre compteur.
+# Appelez la méthode "each" avec un bloc de code comme ceci :
+
+(1..5).each do |compteur|
+  puts "itération #{compteur}"
+end
+#=> itération 1
+#=> itération 2
+#=> itération 3
+#=> itération 4
+#=> itération 5
+
+# Vous pouvez également mettre un bloc de code entre accolades :
+(1..5).each {|compteur| puts "itération #{compteur}"}
+
+# Le contenu des structures de données peut être parcouru
+# en utilisant la méthode each.
+array.each do |element|
+  puts "#{element} est une partie du tableau"
+end
+hash.each do |cle, valeur|
+  puts "#{cle} est #{valeur}"
+end
+
+compteur = 1
+while compteur <= 5 do
+  puts "itération #{compteur}"
+  compteur += 1
+end
+#=> itération 1
+#=> itération 2
+#=> itération 3
+#=> itération 4
+#=> itération 5
+
+grade = 'B'
+
+case grade
+when 'A'
+  puts "Excellent"
+when 'B'
+  puts "Plus de chance la prochaine fois"
+when 'C'
+  puts "Vous pouvez faire mieux"
+when 'D'
+  puts "C'est pas terrible"
+when 'F'
+  puts "Vous avez échoué!"
+else
+  puts "Sytème de notation alternatif"
+end
+
+# Fonctions
+
+def double(x)
+  x * 2
+end
+
+# Les fonctions (et tous les blocs de code) retournent
+# implicitement la valeur de la dernière instruction évaluée
+double(2) #=> 4
+
+# Les paranthèses sont facultative
+# lorsqu'il n'y a pas d'ambiguïté sur le résultat
+double 3 #=> 6
+
+double double 3 #=> 12
+
+def sum(x,y)
+  x + y
+end
+
+# Les paramètres de méthode sont séparés par des virgules
+sum 3, 4 #=> 7
+
+sum sum(3,4), 5 #=> 12
+
+# yield
+# Toutes les méthodes ont un argument facultatif et implicite
+# de type bloc de code
+# il peut être appelé avec le mot clé 'yield'
+
+def surround
+  puts "{"
+  yield
+  puts "}"
+end
+
+surround { puts 'Bonjour tout le monde' }
+
+# {
+# Bonjour tout le monde
+# }
+
+
+# Définissez une classe avec le mot clé 'class'
+class Humain
+
+  # Une variable de classe
+  # est partagée par toutes les instances de cette classe.
+  @@espece = "H. sapiens"
+
+  # Constructeur de classe
+  def initialize(nom, age = 0)
+    # Affectez l'argument à la variable d'instance 'nom'
+    # pour la durée de vie de l'instance de cette classe
+    @nom = nom
+    # Si le paramètre 'age' est absent,
+    # la valeur par défaut définie dans la liste des arguments sera utilisée.
+    @age = age
+  end
+
+  # Une simple méthode setter
+  def nom=(nom)
+    @nom = nom
+  end
+
+  # Une simple méthode getter
+  def nom
+    @nom
+  end
+
+  # Une méthode de classe utilise le mot clé 'self'
+  # pour se distinguer de la méthode d'instance.
+  # La méthode sera alors accessible à partir de la classe
+  # et non pas de l'instance.
+  def self.say(msg)
+    puts "#{msg}"
+  end
+
+  def species
+    @@species
+  end
+
+end
+
+
+# Instanciez une classe
+jim = Humain.new("Jim Halpert")
+
+dwight = Humain.new("Dwight K. Schrute")
+
+# Appelez quelques méthodes
+jim.espece #=> "H. sapiens"
+jim.nom #=> "Jim Halpert"
+jim.nom = "Jim Halpert II" #=> "Jim Halpert II"
+jim.nom #=> "Jim Halpert II"
+dwight.espece #=> "H. sapiens"
+dwight.nom #=> "Dwight K. Schrute"
+
+# Appelez la méthode de classe
+Humain.say("Hi") #=> "Hi"
+
+# Les classes sont également des objets en Ruby.
+# Par conséquent, les classes peuvent avoir des variables d'instance.
+# Les variables de classe sont partagées parmi
+# la classe et ses descendants.
+
+# Classe parente
+class Humain
+  @@foo = 0
+
+  def self.foo
+    @@foo
+  end
+
+  def self.foo=(valeur)
+    @@foo = valeur
+  end
+end
+
+# Classe fille
+class Travailleur < Humain
+end
+
+Humain.foo # 0
+Travailleur.foo # 0
+
+Humain.foo = 2 # 2
+Travailleur.foo # 2
+
+# Les variables d'instance de classe ne sont pas partagées
+# avec les classes héritées.
+
+class Humain
+  @bar = 0
+
+  def self.bar
+    @bar
+  end
+
+  def self.bar=(valeur)
+    @bar = valeur
+  end
+end
+
+class Docteur < Humain
+end
+
+Humain.bar # 0
+Docteur.bar # nil
+
+```
diff --git a/go.html.markdown b/go.html.markdown
new file mode 100644
index 00000000..4db76a49
--- /dev/null
+++ b/go.html.markdown
@@ -0,0 +1,301 @@
+---
+name: Go
+category: language
+language: Go
+filename: learngo.go
+contributors:
+    - ["Sonia Keys", "https://github.com/soniakeys"]
+---
+
+Go was created out of the need to get work done.  It's not the latest trend
+in computer science, but it is the newest fastest way to solve real-world
+problems.
+
+It has familiar concepts of imperative languages with static typing.
+It's fast to compile and fast to execute, it adds easy-to-understand
+concurrency to leverage today's multi-core CPUs, and has features to
+help with large-scale programming.
+
+Go comes with a great standard library and an enthusiastic community.
+
+```go
+// Single line comment
+/* Multi-
+   line comment */
+
+// A package clause starts every source file.
+// Main is a special name declaring an executable rather than a library.
+package main
+
+// Import declaration declares library packages referenced in this file.
+import (
+    "fmt"      // A package in the Go standard library
+    "net/http" // Yes, a web server!
+    "strconv"  // String conversions
+)
+
+// A function definition.  Main is special.  It is the entry point for the
+// executable program.  Love it or hate it, Go uses brace brackets.
+func main() {
+    // Println outputs a line to stdout.
+    // Qualify it with the package name, fmt.
+    fmt.Println("Hello world!")
+
+    // Call another function within this package.
+    beyondHello()
+}
+
+// Functions have parameters in parentheses.
+// If there are no parameters, empty parens are still required.
+func beyondHello() {
+    var x int // Variable declaration.  Variables must be declared before use.
+    x = 3     // Variable assignment.
+    // "Short" declarations use := to infer the type, declare, and assign.
+    y := 4
+    sum, prod := learnMultiple(x, y)        // function returns two values
+    fmt.Println("sum:", sum, "prod:", prod) // simple output
+    learnTypes()                            // < y minutes, learn more!
+}
+
+// Functions can have parameters and (multiple!) return values.
+func learnMultiple(x, y int) (sum, prod int) {
+    return x + y, x * y // return two values
+}
+
+// Some built-in types and literals.
+func learnTypes() {
+    // Short declaration usually gives you what you want.
+    s := "Learn Go!" // string type
+
+    s2 := `A "raw" string literal
+can include line breaks.` // same string type
+
+    // non-ASCII literal.  Go source is UTF-8.
+    g := 'Σ' // rune type, an alias for uint32, holds a UTF-8 code point
+
+    f := 3.14195 // float64, an IEEE-754 64-bit floating point number
+    c := 3 + 4i  // complex128, represented internally with two float64s
+
+    // Var syntax with an initializers.
+    var u uint = 7 // unsigned, but implementation dependent size as with int
+    var pi float32 = 22. / 7
+
+    // Conversion syntax with a short declaration.
+    n := byte('\n') // byte is an alias for uint8
+
+    // Arrays have size fixed at compile time.
+    var a4 [4]int           // an array of 4 ints, initialized to all 0
+    a3 := [...]int{3, 1, 5} // an array of 3 ints, initialized as shown
+
+    // Slices have dynamic size.  Arrays and slices each have advantages
+    // but use cases for slices are much more common.
+    s3 := []int{4, 5, 9}    // compare to a3.  no ellipsis here
+    s4 := make([]int, 4)    // allocates slice of 4 ints, initialized to all 0
+    var d2 [][]float64      // declaration only, nothing allocated here
+    bs := []byte("a slice") // type conversion syntax
+
+    p, q := learnMemory() // declares p, q to be type pointer to int.
+    fmt.Println(*p, *q)   // * follows a pointer.  This prints two ints.
+
+    // Maps are a dynamically growable associative array type, like the
+    // hash or dictionary types of some other languages.
+    m := map[string]int{"three": 3, "four": 4}
+    m["one"] = 1
+
+    // Unused variables are an error in Go.
+    // The underbar lets you "use" a variable but discard its value.
+    _, _, _, _, _, _, _, _, _ = s2, g, f, u, pi, n, a3, s4, bs
+    // Output of course counts as using a variable.
+    fmt.Println(s, c, a4, s3, d2, m)
+
+    learnFlowControl() // back in the flow
+}
+
+// Go is fully garbage collected.  It has pointers but no pointer arithmetic.
+// You can make a mistake with a nil pointer, but not by incrementing a pointer.
+func learnMemory() (p, q *int) {
+    // Named return values p and q have type pointer to int.
+    p = new(int) // built-in function new allocates memory.
+    // The allocated int is initialized to 0, p is no longer nil.
+    s := make([]int, 20) // allocate 20 ints as a single block of memory
+    s[3] = 7             // assign one of them
+    r := -2              // declare another local variable
+    return &s[3], &r     // & takes the address of an object.
+}
+
+func expensiveComputation() int {
+    return 1e6
+}
+
+func learnFlowControl() {
+    // If statements require brace brackets, and do not require parens.
+    if true {
+        fmt.Println("told ya")
+    }
+    // Formatting is standardized by the command line command "go fmt."
+    if false {
+        // pout
+    } else {
+        // gloat
+    }
+    // Use switch in preference to chained if statements.
+    x := 1
+    switch x {
+    case 0:
+    case 1:
+        // cases don't "fall through"
+    case 2:
+        // unreached
+    }
+    // Like if, for doesn't use parens either.
+    for x := 0; x < 3; x++ { // ++ is a statement
+        fmt.Println("iteration", x)
+    }
+    // x == 1 here.
+
+    // For is the only loop statement in Go, but it has alternate forms.
+    for { // infinite loop
+        break    // just kidding
+        continue // unreached
+    }
+    // As with for, := in an if statement means to declare and assign y first,
+    // then test y > x.
+    if y := expensiveComputation(); y > x {
+        x = y
+    }
+    // Function literals are closures.
+    xBig := func() bool {
+        return x > 100 // references x declared above switch statement.
+    }
+    fmt.Println("xBig:", xBig()) // true (we last assigned 1e6 to x)
+    x /= 1e5                     // this makes it == 10
+    fmt.Println("xBig:", xBig()) // false now
+
+    // When you need it, you'll love it.
+    goto love
+love:
+
+    learnInterfaces() // Good stuff coming up!
+}
+
+// Define Stringer as an interface type with one method, String.
+type Stringer interface {
+    String() string
+}
+
+// Define pair as a struct with two fields, ints named x and y.
+type pair struct {
+    x, y int
+}
+
+// Define a method on type pair.  Pair now implements Stringer.
+func (p pair) String() string { // p is called the "receiver"
+    // Sprintf is another public function in package fmt.
+    // Dot syntax references fields of p.
+    return fmt.Sprintf("(%d, %d)", p.x, p.y)
+}
+
+func learnInterfaces() {
+    // Brace syntax is a "struct literal."  It evaluates to an initialized
+    // struct.  The := syntax declares and initializes p to this struct.
+    p := pair{3, 4}
+    fmt.Println(p.String()) // call String method of p, of type pair.
+    var i Stringer          // declare i of interface type Stringer.
+    i = p                   // valid because pair implements Stringer
+    // Call String method of i, of type Stringer.  Output same as above.
+    fmt.Println(i.String())
+
+    // Functions in the fmt package call the String method to ask an object
+    // for a printable representation of itself.
+    fmt.Println(p) // output same as above. Println calls String method.
+    fmt.Println(i) // output same as above
+
+    learnErrorHandling()
+}
+
+func learnErrorHandling() {
+    // ", ok" idiom used to tell if something worked or not.
+    m := map[int]string{3: "three", 4: "four"}
+    if x, ok := m[1]; !ok { // ok will be false because 1 is not in the map.
+        fmt.Println("no one there")
+    } else {
+        fmt.Print(x) // x would be the value, if it were in the map.
+    }
+    // An error value communicates not just "ok" but more about the problem.
+    if _, err := strconv.Atoi("non-int"); err != nil { // _ discards value
+        // prints "strconv.ParseInt: parsing "non-int": invalid syntax"
+        fmt.Println(err)
+    }
+    // We'll revisit interfaces a little later.  Meanwhile,
+    learnConcurrency()
+}
+
+// c is a channel, a concurrency-safe communication object.
+func inc(i int, c chan int) {
+    c <- i + 1 // <- is the "send" operator when a channel appears on the left.
+}
+
+// We'll use inc to increment some numbers concurrently.
+func learnConcurrency() {
+    // Same make function used earlier to make a slice.  Make allocates and
+    // initializes slices, maps, and channels.
+    c := make(chan int)
+    // Start three concurrent goroutines.  Numbers will be incremented
+    // concurrently, perhaps in parallel if the machine is capable and
+    // properly configured.  All three send to the same channel.
+    go inc(0, c) // go is a statement that starts a new goroutine.
+    go inc(10, c)
+    go inc(-805, c)
+    // Read three results from the channel and print them out.
+    // There is no telling in what order the results will arrive!
+    fmt.Println(<-c, <-c, <-c) // channel on right, <- is "receive" operator.
+
+    cs := make(chan string)       // another channel, this one handles strings.
+    cc := make(chan chan string)  // a channel of channels.
+    go func() { c <- 84 }()       // start a new goroutine just to send a value
+    go func() { cs <- "wordy" }() // again, for cs this time
+    // Select has syntax like a switch statement but each case involves
+    // a channel operation.  It selects a case at random out of the cases
+    // that are ready to communicate.
+    select {
+    case i := <-c: // the value received can be assigned to a variable
+        fmt.Println("it's a", i)
+    case <-cs: // or the value received can be discarded
+        fmt.Println("it's a string")
+    case <-cc: // empty channel, not ready for communication.
+        fmt.Println("didn't happen.")
+    }
+    // At this point a value was taken from either c or cs.  One of the two
+    // goroutines started above has completed, the other will remain blocked.
+
+    learnWebProgramming() // Go does it.  You want to do it too.
+}
+
+// A single function from package http starts a web server.
+func learnWebProgramming() {
+    // ListenAndServe first parameter is TCP address to listen at.
+    // Second parameter is an interface, specifically http.Handler.
+    err := http.ListenAndServe(":8080", pair{})
+    fmt.Println(err) // don't ignore errors
+}
+
+// Make pair an http.Handler by implementing its only method, ServeHTTP.
+func (p pair) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+    // Serve data with a method of http.ResponseWriter
+    w.Write([]byte("You learned Go in Y minutes!"))
+}
+```
+
+## Further Reading
+
+The root of all things Go is the [official Go web site](http://golang.org/).
+There you can follow the tutorial, play interactively, and read lots.
+
+The language definition itself is highly recommended.  It's easy to read
+and amazingly short (as language definitions go these days.)
+
+On the reading list for students of Go is the source code to the standard
+library.  Comprehensively documented, it demonstrates the best of readable
+and understandable Go, Go style, and Go idioms.  Click on a function name
+in the documentation and the source code comes up!
+
diff --git a/groovy.html.markdown b/groovy.html.markdown
new file mode 100644
index 00000000..1a635e59
--- /dev/null
+++ b/groovy.html.markdown
@@ -0,0 +1,399 @@
+---
+language: Groovy
+filename: learngroovy.groovy
+contributors:
+    - ["Roberto Pérez Alcolea", "http://github.com/rpalcolea"]
+filename: learngroovy.groovy
+---
+
+Groovy - A dynamic language for the Java platform [Read more here.](http://groovy.codehaus.org)
+
+```cpp
+
+/*
+  Set yourself up:
+
+  1) Install GVM - http://gvmtool.net/
+  2) Install Groovy: gvm install groovy
+  3) Start the groovy console by typing: groovyConsole
+
+*/
+
+//  Single line comments start with two forward slashes
+/*
+Multi line comments look like this.
+*/
+
+// Hello World
+println "Hello world!"
+
+/*
+  Variables:
+
+  You can assign values to variables for later use
+*/
+
+def x = 1
+println x
+
+x = new java.util.Date()
+println x
+
+x = -3.1499392
+println x
+
+x = false
+println x
+
+x = "Groovy!"
+println x
+
+/*
+  Collections and maps
+*/
+//Creating an empty list
+def technologies = []
+
+//Add an element to the list
+technologies << "Groovy"
+technologies.add("Grails")
+technologies.addAll(["Gradle","Griffon"])
+
+//Remove an element from the list
+technologies.remove("Griffon")
+
+//Iterate over elements of a list
+technologies.each { println "Technology: $it"}
+technologies.eachWithIndex { it, i -> println "$i: $it"}
+
+//Evaluate if a list contains element(s) (boolean)
+technologies.contains('Groovy')
+technologies.containsAll(['Groovy','Grails'])
+
+//Sort a list
+technologies.sort()
+
+//Replace all elements in the list
+Collections.replaceAll(technologies, 'Gradle', 'gradle')
+
+//Shuffle a list
+Collections.shuffle(technologies, new Random())
+
+//Clear a list
+technologies.clear()
+
+//Creating an empty map
+def devMap = [:]
+
+//Add values
+devMap = ['name':'Roberto', 'framework':'Grails', 'language':'Groovy']
+devMap.put('lastName','Perez')
+
+//Iterate over elements of a map
+devMap.each { println "$it.key: $it.value" }
+devMap.eachWithIndex { it, i -> println "$i: $it"}
+
+//Evaluate if a map contains a key
+assert devMap.containsKey('name')
+
+//Evaluate if a map contains a value
+assert devMap.containsValue('Roberto')
+
+//Get the keys of a map
+println devMap.keySet()
+
+//Get the values of a map
+println devMap.values()
+
+/*
+  Groovy Beans
+
+  GroovyBeans are JavaBeans but using a much simpler syntax
+
+  When Groovy is compiled to bytecode, the following rules are used.
+
+    * If the name is declared with an access modifier (public, private or
+      protected) then a field is generated.
+
+    * A name declared with no access modifier generates a private field with
+      public getter and setter (i.e. a property).
+
+    * If a property is declared final the private field is created final and no
+      setter is generated.
+
+    * You can declare a property and also declare your own getter or setter.
+
+    * You can declare a property and a field of the same name, the property will
+      use that field then.
+
+    * If you want a private or protected property you have to provide your own
+      getter and setter which must be declared private or protected.
+
+    * If you access a property from within the class the property is defined in
+      at compile time with implicit or explicit this (for example this.foo, or
+      simply foo), Groovy will access the field directly instead of going though
+      the getter and setter.
+
+    * If you access a property that does not exist using the explicit or
+      implicit foo, then Groovy will access the property through the meta class,
+      which may fail at runtime.
+
+*/
+
+class Foo {
+    // read only property
+    final String name = "Roberto"
+
+    // read only property with public getter and protected setter
+    String language
+    protected void setLanguage(String language) { this.language = language }
+
+    // dynamically typed property
+    def lastName
+}
+
+/*
+  Logical Branching and Looping
+*/
+
+//Groovy supports the usual if - else syntax
+def x = 3
+
+if(x==1) {
+    println "One"
+} else if(x==2) {
+    println "Two"
+} else {
+    println "X greater than Two"
+}
+
+//Groovy also supports the ternary operator:
+def y = 10
+def x = (y > 1) ? "worked" : "failed"
+assert x == "worked"
+
+//For loop
+//Iterate over a range
+def x = 0
+for (i in 0 .. 30) {
+    x += i
+}
+
+//Iterate over a list
+x = 0
+for( i in [5,3,2,1] ) {
+    x += i
+}
+
+//Iterate over an array
+array = (0..20).toArray()
+x = 0
+for (i in array) {
+    x += i
+}
+
+//Iterate over a map
+def map = ['name':'Roberto', 'framework':'Grails', 'language':'Groovy']
+x = 0
+for ( e in map ) {
+    x += e.value
+}
+
+/*
+  Operators
+
+  Operator Overloading for a list of the common operators that Groovy supports:
+  http://groovy.codehaus.org/Operator+Overloading
+
+  Helpful groovy operators
+*/
+//Spread operator:  invoke an action on all items of an aggregate object.
+def technologies = ['Groovy','Grails','Gradle']
+technologies*.toUpperCase() // = to technologies.collect { it?.toUpperCase() }
+
+//Safe navigation operator: used to avoid a NullPointerException.
+def user = User.get(1)
+def username = user?.username
+
+
+/*
+  Closures
+  A Groovy Closure is like a "code block" or a method pointer. It is a piece of
+  code that is defined and then executed at a later point.
+
+  More info at: http://groovy.codehaus.org/Closures+-+Formal+Definition
+*/
+//Example:
+def clos = { println "Hello World!" }
+
+println "Executing the Closure:"
+clos()
+
+//Passing parameters to a closure
+def sum = { a, b -> println a+b }
+sum(2,4)
+
+//Closures may refer to variables not listed in their parameter list.
+def x = 5
+def multiplyBy = { num -> num * x }
+println multiplyBy(10)
+
+// If you have a Closure that takes a single argument, you may omit the
+// parameter definition of the Closure
+def clos = { print it }
+clos( "hi" )
+
+/*
+  Groovy can memorize closure results [1][2][3]
+*/
+def cl = {a, b ->
+    sleep(3000) // simulate some time consuming processing
+    a + b
+}
+
+mem = cl.memoize()
+
+def callClosure(a, b) {
+    def start = System.currentTimeMillis()
+    mem(a, b)
+    println "Inputs(a = $a, b = $b) - took ${System.currentTimeMillis() - start} msecs."
+}
+
+callClosure(1, 2)
+callClosure(1, 2)
+callClosure(2, 3)
+callClosure(2, 3)
+callClosure(3, 4)
+callClosure(3, 4)
+callClosure(1, 2)
+callClosure(2, 3)
+callClosure(3, 4)
+
+/*
+  Expando
+
+  The Expando class is a dynamic bean so we can add properties and we can add
+  closures as methods to an instance of this class
+
+  http://mrhaki.blogspot.mx/2009/10/groovy-goodness-expando-as-dynamic-bean.html
+*/
+  def user = new Expando(name:"Roberto")
+  assert 'Roberto' == user.name
+
+  user.lastName = 'Pérez'
+  assert 'Pérez' == user.lastName
+
+  user.showInfo = { out ->
+      out << "Name: $name"
+      out << ", Last name: $lastName"
+  }
+
+  def sw = new StringWriter()
+  println user.showInfo(sw)
+
+
+/*
+  Metaprogramming (MOP)
+*/
+
+//Using ExpandoMetaClass to add behaviour
+String.metaClass.testAdd = {
+    println "we added this"
+}
+
+String x = "test"
+x?.testAdd()
+
+//Intercepting method calls
+class Test implements GroovyInterceptable {
+    def sum(Integer x, Integer y) { x + y }
+
+    def invokeMethod(String name, args) {
+        System.out.println "Invoke method $name with args: $args"
+    }
+}
+
+def test = new Test()
+test?.sum(2,3)
+test?.multiply(2,3)
+
+//Groovy supports propertyMissing for dealing with property resolution attempts.
+class Foo {
+   def propertyMissing(String name) { name }
+}
+def f = new Foo()
+
+assertEquals "boo", f.boo
+
+/*
+  TypeChecked and CompileStatic
+  Groovy, by nature, is and will always be a dynamic language but it supports
+  typechecked and compilestatic
+
+  More info: http://www.infoq.com/articles/new-groovy-20
+*/
+//TypeChecked
+import groovy.transform.TypeChecked
+
+void testMethod() {}
+
+@TypeChecked
+void test() {
+    testMeethod()
+
+    def name = "Roberto"
+
+    println naameee
+
+}
+
+//Another example:
+import groovy.transform.TypeChecked
+
+@TypeChecked
+Integer test() {
+    Integer num = "1"
+
+    Integer[] numbers = [1,2,3,4]
+
+    Date date = numbers[1]
+
+    return "Test"
+
+}
+
+//CompileStatic example:
+import groovy.transform.CompileStatic
+
+@CompileStatic
+int sum(int x, int y) {
+    x + y
+}
+
+assert sum(2,5) == 7
+
+
+```
+
+## Further resources
+
+[Groovy documentation](http://groovy.codehaus.org/Documentation)
+
+[Groovy web console](http://groovyconsole.appspot.com/)
+
+Join a [Groovy user group](http://groovy.codehaus.org/User+Groups)
+
+## Books
+
+* [Groovy Goodness] (https://leanpub.com/groovy-goodness-notebook)
+
+* [Groovy in Action] (http://manning.com/koenig2/)
+
+* [Programming Groovy 2: Dynamic Productivity for the Java Developer] (http://shop.oreilly.com/product/9781937785307.do)
+
+[1] http://roshandawrani.wordpress.com/2010/10/18/groovy-new-feature-closures-can-now-memorize-their-results/
+[2] http://www.solutionsiq.com/resources/agileiq-blog/bid/72880/Programming-with-Groovy-Trampoline-and-Memoize
+[3] http://mrhaki.blogspot.mx/2011/05/groovy-goodness-cache-closure-results.html
+
+
+
diff --git a/haskell.html.markdown b/haskell.html.markdown
index 9847ef2a..e3ec3f38 100644
--- a/haskell.html.markdown
+++ b/haskell.html.markdown
@@ -84,7 +84,7 @@ not False -- True
 -- rest of the elements of this "infinite" list don't exist yet! Haskell won't
 -- actually evaluate them until it needs to.
 
-- joining two lists
+-- joining two lists
 [1..5] ++ [6..10]
 
 -- adding to the head of a list
diff --git a/hu-hu/go.html.markdown b/hu-hu/go.html.markdown
new file mode 100644
index 00000000..460e23ec
--- /dev/null
+++ b/hu-hu/go.html.markdown
@@ -0,0 +1,335 @@
+---
+language: Go
+lang: hu-hu
+filename: learngo-hu.go
+contributors:
+    - ["Sonia Keys", "https://github.com/soniakeys"]
+translators:
+    - ["Szabó Krisztián", "https://github.com/thenonameguy/"]
+---
+
+A Go programozási nyelv az életszerű feladatok könnyebb elvégzése miatt született.
+A mai legújabb programozási trendeket elkerülve,
+praktikus megoldást nyújt a valós, üzleti problémákra.
+
+C-szerű szintaktikával és statikus típuskezeléssel rendelkezik.
+A fordító szempillantás alatt végez és egy gyorsan futó,statikus futtatható állományt hoz létre.
+A nyelv könnyen érthető, üzenet-alapú konkurenciát tesz lehetővé, így könnyen ki lehet használni
+a mai számítógépek több magos processzorait, ez nagy rendszerek építéséhez ideális.
+
+A Go alap könyvtára mindenre területre kiterjed, ennek köszönhetően a nyelvnek egyre növekvő tábora van.
+
+```go
+// Egy soros komment
+/* Több
+   soros komment */
+
+// Minden forrás fájl egy csomag-definícióval kezdődik, ez hasonlít a Python
+// csomagkezelésére
+// A main egy különleges csomagnév, ennek a fordítása futtatható állományt hoz
+// létre egy könyvtár helyett.
+package main
+
+// Az import rész meghatározza melyik csomagokat kívánjuk használni ebben a
+// forrásfájlban
+import (
+    "fmt"      // A Go alap könyvtárának része
+    "net/http" // Beépített webszerver!
+    "strconv"  // Stringek átalakítására szolgáló csomag
+)
+
+// Funkció deklarás, a main nevű funkció a program kezdőpontja.
+func main() {
+    // Println kiírja a beadott paramétereket a standard kimenetre.
+    // Ha más csomagot funkcióját akarjuk használni, akkor azt jelezni kell a
+    // csomag nevével
+    fmt.Println("Hello world!")
+
+    // Meghívunk egy másik funkciót ebből a csomagból
+    beyondHello()
+}
+
+// A függvények paraméterei zárójelek között vannak.
+// Ha nincsenek paraméterek, akkor is kötelező a zárójel-pár.
+func beyondHello() {
+    var x int // Változó deklaráció, használat előtt muszáj ezt megtenni.
+    x = 3     // Változó értékadás
+    // "Rövid" deklaráció is létezik, ez az érték alapján deklarálja,
+    // definiálja és értéket is ad a változónak
+    y := 4
+    sum, prod := learnMultiple(x, y)        // a függvényeknek több
+                                            // visszatérési értéke is lehet
+    fmt.Println("sum:", sum, "prod:", prod) // egyszerű kiíratás
+    learnTypes()
+}
+
+// A funkcióknak elnevezett visszatérési értékük is lehet
+func learnMultiple(x, y int) (sum, prod int) {
+    return x + y, x * y // visszatérünk két értékkel
+    /*
+    sum = x + y
+    prod = x * y
+    return
+    Ez ugyanezzel az eredménnyel járt volna, mint a fenti sor.
+    Üres return esetén, az elnevezett visszatérési változók 
+    aktuális értékeikkel térnek vissza. */
+}
+
+// Beépített típusok
+func learnTypes() {
+    // Rövid deklarás az esetek többségében elég lesz a változókhoz
+    s := "Tanulj Go-t!" // string típus
+
+    s2 := `A "nyers" stringekben lehetnek
+    újsorok is!` // de ettől még ez is ugyanolyan string mint az s, nincs külön
+                 // típusa
+
+    // nem ASCII karakterek.  Minden Go forrás UTF-8 és a stringek is azok.
+    g := 'Σ' // rúna(rune) típus, megegyezik az uint32-vel, egy UTF-8 karaktert
+             // tárol
+
+    f := 3.14195 // float64, az IEEE-754 szabványnak megfelelő 64-bites
+                 // lebegőpontos szám
+    c := 3 + 4i  // complex128, belsőleg két float64-el tárolva
+
+    // Var szintaxis változó típus definiálással
+    var u uint = 7 // unsigned, az implementáció dönti el mekkora, akárcsak az
+                   // int-nél
+    var pi float32 = 22. / 7
+
+    // Rövid deklarásnál átalakítás is lehetséges
+    n := byte('\n') // byte típus, ami megegyezik az uint8-al
+
+    // A tömböknek fordítás-időben fixált méretük van
+    var a4 [4]int           // egy tömb 4 int-tel, mind 0-ra inicializálva
+    a3 := [...]int{3, 1, 5} // egy tömb 3 int-tel, láthatóan inicalizálva egyedi
+                            // értékekre
+
+    // Szeleteknek dinamikus a méretük. A szeleteknek és a tömböknek is meg
+    // vannak az előnyeik de a szeleteket sokkal gyakrabban használjuk.
+    s3 := []int{4, 5, 9}    // vesd össze a3-al, nincsenek pontok.
+    s4 := make([]int, 4)    // allokál 4 int-et, mind 0-ra inicializálva
+    var d2 [][]float64      // ez csak deklaráció, semmi sincs még allokálva
+    bs := []byte("a slice") // típus konverzió szintaxisa
+
+    p, q := learnMemory() // deklarál két mutatót (p,q), két int-re
+    fmt.Println(*p, *q)   // * követi a mutatót. Ez a sor kiírja a két int értékét.
+
+    // A map a dinamikusan növelhető asszociatív tömb része a nyelvnek, hasonlít
+    // a hash és dictionary típusokra más nyelvekben.
+    m := map[string]int{"three": 3, "four": 4}
+    m["one"] = 1
+
+    // A felhasználatlan változók fordítás-idejű hibát okoznak a Go-ban.
+    // Az aláhúzással "használod" a változókat, de eldobod az értéküket.
+    _, _, _, _, _, _, _, _, _ = s2, g, f, u, pi, n, a3, s4, bs
+    // Kiíratás is természetesen használatnak minősül
+    fmt.Println(s, c, a4, s3, d2, m)
+
+    learnFlowControl()
+}
+
+// A Go nyelv teljesen szemétgyűjtött (garbage-collected). Megtalálhatók benne
+// mutatók, de nincs mutató aritmetika. Ez azt jelenti, hogy üres mutatóval még
+// mindig hibázhatsz, de hozzáadni/műveleteket végezni már nem lehet.
+func learnMemory() (p, q *int) {
+    // Elnevezett visszatérési változóknak int-re mutató a típusa
+    p = new(int) // a beépített "new" funkció, egy típusnak elegendő memóriát
+                 // allokál, és visszaad rá egy mutatót.
+    // Az allokált int nullázva van, p többé nem üres mutató.
+    s := make([]int, 20) // allokáljunk 20 int változót egy memóriaterületen.
+    s[3] = 7             // adjunk értéket az egyiknek
+    r := -2              // hozzánk létre egy lokális változót
+    return &s[3], &r     // A & megadja a memóriacímét a változónak
+}
+
+func expensiveComputation() int {
+    return 1e6
+}
+
+func learnFlowControl() {
+    // Az elágazásoknak kötelező a kapcsos zárójel, a zárójel nem szükséges.
+    if true {
+        fmt.Println("megmondtam")
+    }
+    // A kód formátumát a nyelvvel járó "go" parancssori program "go fmt"
+    // parancsa szabványosítja
+    if false {
+        // így lehet
+    } else {
+        // if/else-t csinálni
+    }
+    // Használjunk switchet a hosszabb elágazások alkalmazása helyett.
+    x := 1
+    switch x {
+    case 0:
+    case 1:
+        // Az "esetek" nem "esnek át", tehát
+    case 2:
+        // ez nem fog lefutni, nincs szükség break-ekre.
+    }
+    // A for ciklus sem használ zárójeleket
+    for x := 0; x < 3; x++ { 
+        fmt.Println("iteráció", x)
+    }
+    // itt az x == 1.
+
+    // A for az egyetlen ciklus fajta a Go-ban, de több formája van.
+    for { // végtelen ciklus
+        break    // csak vicceltem
+        continue // soha nem fut le
+    }
+    // Akárcsak a for-nál, az if-ben is lehet rövid deklarással egy lokális
+    // változót létrehozni ami az blokk összes if/else-n keresztül érvényes
+    // marad.
+    if y := expensiveComputation(); y > x {
+        x = y
+    }
+    // Függvényeket használhatjuk closure-ként is.
+    xBig := func() bool {
+        return x > 100 // a switch felett deklarált x-et használjuk itt
+    }
+    fmt.Println("xBig:", xBig()) // igaz (utoljára 1e6 lett az értéke az x-nek)
+    x /= 1e5                     // így most már x == 10
+    fmt.Println("xBig:", xBig()) // 10 pedig kisebb mint 100, tehát hamis
+
+    // Ha nagyon-nagyon szükséges, akkor használhatjuk a jó öreg goto-t.
+    goto love
+love:
+
+    learnInterfaces() // Itt kezdődnek az érdekes dolgok!
+}
+
+// Definiáljuk a Stringert egy olyan interfésznek, amelynek egy metódusa van, a
+// String, ami visszatér egy stringgel.
+type Stringer interface {
+    String() string
+}
+
+// Definiáljuk a pair-t egy olyan struktúrának amelynek két int változója van,
+// x és y.
+type pair struct {
+    x, y int
+}
+
+// Definiáljunk egy metódust a pair struktúrának, ezzel teljesítve a Stringer
+// interf
+func (p pair) String() string { // p lesz a "vevő"
+    // Sprintf az fmt csomag egy publikus függvénye, műkődése megegyezik a C-s
+    // megfelelőjével. A pontokkal érjük el a mindenkori p struktúra elemeit
+    return fmt.Sprintf("(%d, %d)", p.x, p.y)
+}
+
+func learnInterfaces() {
+    // A kapcsos zárójellel jelezzük, hogy egyből inicializálni
+    // szeretnénk a struktúra változóit a sorrendnek megfelelően.
+    p := pair{3, 4}
+    fmt.Println(p.String()) // meghívjuk a p String metódusát.
+    var i Stringer          // deklaráljuk i-t Stringer típusú interfésznek
+    i = p                   // lehetséges, mert a pair struktúra eleget tesz a
+                            // Stringer interfésznek
+    // Meghívjuk i String metódusát, az eredmény ugyanaz, mint az előbb.
+    fmt.Println(i.String())
+
+    // Az fmt csomag funckciói  automatikusan meghívják a String funkciót
+    // hogy megtudják egy objektum szöveges reprezentációját.
+    fmt.Println(p) // ugyan az az eredmény mint az előbb, a Println meghívja
+                   // a String metódust.
+    fmt.Println(i) // dettó
+
+    learnErrorHandling()
+}
+
+func learnErrorHandling() {
+    // ", ok" szokásos megoldás arra, hogy jól működött-e a függvény.
+    m := map[int]string{3: "three", 4: "four"}
+    if x, ok := m[1]; !ok { // ok hamis lesz, mert az 1 nincs benne a map-ban.
+        fmt.Println("nincs meg")
+    } else {
+        fmt.Print(x) // x lenne az érték, ha benne lenne a map-ban.
+    }
+    // A hiba érték többet is elmond a függvény kimeneteléről, mint hogy minden
+    // "ok" volt-e
+    if _, err := strconv.Atoi("non-int"); err != nil { // _ eldobja az értéket,
+                                                       // úgy se lesz jó jelen
+                                                       // esetben
+        // kiírja, hogy "strconv.ParseInt: parsing "non-int": invalid syntax"
+        fmt.Println(err)
+    }
+    // Az interfészekre még visszatérünk, addig is jöjjön a konkurens programozás!
+    learnConcurrency()
+}
+
+// c egy csatorna, egy konkurens-biztos kommunikációs objektum.
+func inc(i int, c chan int) {
+    c <- i + 1 // <- a "küldés" operátor, ha a bal oldalán csatorna van, így
+               // i+1-et küld be a csatornába
+}
+
+// Az inc-et fogjuk arra használni, hogy konkurensen megnöveljünk számokat
+func learnConcurrency() {
+    // Ugyan az a make funkció amivel korábban szeleteket hoztunk létre.
+    // Make allokál mapokat, szeleteket és csatornákat.
+    c := make(chan int)
+    // Indítsunk három konkurens goroutine-t.  A számok konkurensen lesznek 
+    // megnövelve, ha a számítógép képes rá és jól be van állítva, akkor pedig
+    // paralellizálva/egymás mellett. Mind a 3 ugyanabba a csatornába küldi az
+    // eredményeket.
+    go inc(0, c) // A go utasítás indít el goroutine-okat.
+    go inc(10, c)
+    go inc(-805, c)
+    // Beolvassuk 3x a csatornából az eredményeket és kiírjuk őket a kimenetre.
+    // Nem lehet tudni milyen sorrendben fognak érkezni az eredmények!
+    fmt.Println(<-c, <-c, <-c) // hogyha a jobb oldalon csatorna van, akkor a 
+                               // "<-" a beolvasó/kapó operátor
+
+    cs := make(chan string)       // még egy csatorna, ez stringekkel kommunikál
+    cc := make(chan chan string)  // egy csatorna csatornával
+    go func() { c <- 84 }()       // indítsunk egy új goroutine-t, csak azért
+                                  // hogy küldjünk egy számot
+    go func() { cs <- "wordy" }() // ugyanez, csak a cs csatornába stringet
+                                  // küldünk
+    // A select olyan mint a switch, csak feltételek helyett csatorna műveletek
+    // vannak. Véletlenszerűen kiválasztja az első olyan esetet, ahol létrejöhet
+    // kommunikáció.
+    select {
+    case i := <-c: // a megkapott értéket el lehet tárolni egy változóban
+        fmt.Println("ez egy", i)
+    case <-cs: // vagy el lehet dobni az értékét
+        fmt.Println("ez egy string volt")
+    case <-cc: // üres csatorna, soha nem fog rajta semmi se érkezni
+        fmt.Println("sose futok le :'( ")
+    }
+    // Ezen a ponton vagy c vagy a cs goroutineja lefutott.
+    // Amelyik hamarabb végzett, annak a megfelelő case-e lefutott, a másik
+    // blokkolva vár.
+
+    learnWebProgramming() // Go képes rá. Te is képes akarsz rá lenni.
+}
+
+// Egy funkció a http csomagból elindít egy webszervert.
+func learnWebProgramming() {
+    // A ListenAndServe első paramétre egy TCP port, amin kiszolgálunk majd.
+    // Második paramétere egy interfész, pontosabban a http.Handler interfész.
+    err := http.ListenAndServe(":8080", pair{})
+    fmt.Println(err) // nem felejtük el kiírni az esetleges hibákat!
+}
+
+// Csináljunk a pair-ból egy http.Handler-t úgy, hogy implementáljuk az
+// egyetlen metódusát a ServeHTTP-t.
+func (p pair) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+    // Minden kapcsolatra elküldjük ezt a http.ResponseWriter-el
+    w.Write([]byte("Megtanultad a Go-t Y perc alatt!"))
+}
+```
+
+## További olvasmányok
+
+Minden Go-val kapcsolatos megtaláható a [hivatalos Go weboldalon](http://golang.org/).
+Ott követhetsz egy tutorialt, játszhatsz a nyelvvel az interneten és sok érdekességet olvashatsz.
+
+A nyelv specifikációját kifejezetten érdemes olvasni, viszonylag rövid és sokat tanul belőle az ember.
+
+Ha pedig jobban bele akarod vetni magad a Go-ba, akkor a standard könyvtárban a legjobb praktikákat kilesheted.
+TIPP: a dokumentációban kattints egy funkció nevére és rögtön megmutatja a hozzá tartozó kódot!
+
diff --git a/java.html.markdown b/java.html.markdown
index b4531635..cdcf620c 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -405,3 +405,7 @@ Other Topics To Research:
 * [Generics](http://docs.oracle.com/javase/tutorial/java/generics/index.html)
 
 * [Java Code Conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html)
+
+Books:
+
+* [Head First Java] (http://www.headfirstlabs.com/books/hfjava/)
diff --git a/javascript.html.markdown b/javascript.html.markdown
index cc279b9a..fb79949e 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -30,83 +30,84 @@ doStuff();
 // wherever there's a newline, except in certain cases.
 doStuff()
 
-// We'll leave semicolons off here; whether you do or not will depend on your
-// personal preference or your project's style guide.
+// So that we don't have to worry about those certain cases (for now), we'll
+// leave them on.
 
 ///////////////////////////////////
 // 1. Numbers, Strings and Operators
 
 // Javascript has one number type (which is a 64-bit IEEE 754 double).
-3 // = 3
-1.5 // = 1.5
+3; // = 3
+1.5; // = 1.5
 
 // All the basic arithmetic works as you'd expect.
-1 + 1 // = 2
-8 - 1 // = 7
-10 * 2 // = 20
-35 / 5 // = 7
+1 + 1; // = 2
+8 - 1; // = 7
+10 * 2; // = 20
+35 / 5; // = 7
 
 // Including uneven division.
-5 / 2 // = 2.5
+5 / 2; // = 2.5
 
 // Bitwise operations also work; when you perform a bitwise operation your float
 // is converted to a signed int *up to* 32 bits.
-1 << 2 // = 4
+1 << 2; // = 4
 
 // Precedence is enforced with parentheses.
-(1 + 3) * 2 // = 8
+(1 + 3) * 2; // = 8
 
 // There are three special not-a-real-number values:
-Infinity // result of e.g. 1/0
--Infinity // result of e.g. -1/0
-NaN // result of e.g. 0/0
+Infinity; // result of e.g. 1/0
+-Infinity; // result of e.g. -1/0
+NaN; // result of e.g. 0/0
 
 // There's also a boolean type.
-true
-false
+true;
+false;
 
 // Strings are created with ' or ".
-'abc'
-"Hello, world"
+'abc';
+"Hello, world";
 
 // Negation uses the ! symbol
-!true // = false
-!false // = true
+!true; // = false
+!false; // = true
 
 // Equality is ==
-1 == 1 // = true
-2 == 1 // = false
+1 == 1; // = true
+2 == 1; // = false
 
 // Inequality is !=
-1 != 1 // = false
-2 != 1 // = true
+1 != 1; // = false
+2 != 1; // = true
 
 // More comparisons
-1 < 10 // = true
-1 > 10 // = false
-2 <= 2 // = true
-2 >= 2 // = true
+1 < 10; // = true
+1 > 10; // = false
+2 <= 2; // = true
+2 >= 2; // = true
 
 // Strings are concatenated with +
-"Hello " + "world!" // = "Hello world!"
+"Hello " + "world!"; // = "Hello world!"
 
 // and are compared with < and >
-"a" < "b" // = true
+"a" < "b"; // = true
 
 // Type coercion is performed for comparisons...
-"5" == 5 // = true
+"5" == 5; // = true
 
 // ...unless you use ===
-"5" === 5 // = false
+"5" === 5; // = false
 
 // You can access characters in a string with charAt
-"This is a string".charAt(0)
+"This is a string".charAt(0);
 
 // There's also null and undefined
-null // used to indicate a deliberate non-value
-undefined // used to indicate a value that hasn't been set yet
+null; // used to indicate a deliberate non-value
+undefined; // used to indicate a value is not currently present (although undefined
+           // is actually a value itself)
 
-// null, undefined, NaN, 0 and "" are falsy, and everything else is truthy.
+// false, null, undefined, NaN, 0 and "" are falsy, and everything else is truthy.
 // Note that 0 is falsy and "0" is truthy, even though 0 == "0".
 
 ///////////////////////////////////
@@ -114,57 +115,57 @@ undefined // used to indicate a value that hasn't been set yet
 
 // Variables are declared with the var keyword. Javascript is dynamically typed,
 // so you don't need to specify type. Assignment uses a single = character.
-var someVar = 5
+var someVar = 5;
 
 // if you leave the var keyword off, you won't get an error...
-someOtherVar = 10
+someOtherVar = 10;
 
 // ...but your variable will be created in the global scope, not in the scope
 // you defined it in.
 
 // Variables declared without being assigned to are set to undefined.
-var someThirdVar // = undefined
+var someThirdVar; // = undefined
 
 // There's shorthand for performing math operations on variables:
-someVar += 5 // equivalent to someVar = someVar + 5; someVar is 10 now
-someVar *= 10 // now someVar is 100
+someVar += 5; // equivalent to someVar = someVar + 5; someVar is 10 now
+someVar *= 10; // now someVar is 100
 
 // and an even-shorter-hand for adding or subtracting 1
-someVar++ // now someVar is 101
-someVar-- // back to 100
+someVar++; // now someVar is 101
+someVar--; // back to 100
 
 // Arrays are ordered lists of values, of any type.
-var myArray = ["Hello", 45, true]
+var myArray = ["Hello", 45, true];
 
 // Their members can be accessed using the square-brackets subscript syntax.
 // Array indices start at zero.
-myArray[1] // = 45
+myArray[1]; // = 45
 
 // JavaScript's objects are equivalent to 'dictionaries' or 'maps' in other
 // languages: an unordered collection of key-value pairs.
-{key1: "Hello", key2: "World"}
+var myObj = {key1: "Hello", key2: "World"};
 
 // Keys are strings, but quotes aren't required if they're a valid
 // JavaScript identifier. Values can be any type.
-var myObj = {myKey: "myValue", "my other key": 4}
+var myObj = {myKey: "myValue", "my other key": 4};
 
 // Object attributes can also be accessed using the subscript syntax,
-myObj["my other key"] // = 4
+myObj["my other key"]; // = 4
 
 // ... or using the dot syntax, provided the key is a valid identifier.
-myObj.myKey // = "myValue"
+myObj.myKey; // = "myValue"
 
 // Objects are mutable; values can be changed and new keys added.
-myObj.myThirdKey = true
+myObj.myThirdKey = true;
 
 // If you try to access a value that's not yet set, you'll get undefined.
-myObj.myFourthKey // = undefined
+myObj.myFourthKey; // = undefined
 
 ///////////////////////////////////
 // 3. Logic and Control Structures
 
 // The if structure works as you'd expect.
-var count = 1
+var count = 1;
 if (count == 3){
     // evaluated if count is 3
 } else if (count == 4) {
@@ -181,10 +182,10 @@ while (true) {
 // Do-while loops are like while loops, except they always run at least once.
 var input
 do {
-    input = getInput()
+    input = getInput();
 } while (!isValid(input))
 
-// the for loop is the same as C and Java: 
+// the for loop is the same as C and Java:
 // initialisation; continue condition; iteration.
 for (var i = 0; i < 5; i++){
     // will run 5 times
@@ -192,29 +193,23 @@ for (var i = 0; i < 5; i++){
 
 // && is logical and, || is logical or
 if (house.size == "big" && house.colour == "blue"){
-    house.contains = "bear"
+    house.contains = "bear";
 }
 if (colour == "red" || colour == "blue"){
     // colour is either red or blue
 }
 
 // && and || "short circuit", which is useful for setting default values.
-var name = otherName || "default"
+var name = otherName || "default";
 
 ///////////////////////////////////
 // 4. Functions, Scope and Closures
 
 // JavaScript functions are declared with the function keyword.
 function myFunction(thing){
-    return thing.toUpperCase()
+    return thing.toUpperCase();
 }
-myFunction("foo") // = "FOO"
-
-// Functions can also be defined "anonymously" - without a name:
-function(thing){
-    return thing.toLowerCase()
-}
-// (we can't call our function, since we don't have a name to refer to it with)
+myFunction("foo"); // = "FOO"
 
 // JavaScript functions are first class objects, so they can be reassigned to
 // different variable names and passed to other functions as arguments - for
@@ -222,52 +217,49 @@ function(thing){
 function myFunction(){
     // this code will be called in 5 seconds' time
 }
-setTimeout(myFunction, 5000)
-
-// You can even write the function statement directly in the call to the other
-// function.
+setTimeout(myFunction, 5000);
 
-setTimeout(function myFunction(){
+// Function objects don't even have to be declared with a name - you can write
+// an anonymous function definition directly into the arguments of another.
+setTimeout(function(){
     // this code will be called in 5 seconds' time
-}, 5000)
+}, 5000);
 
 // JavaScript has function scope; functions get their own scope but other blocks
 // do not.
 if (true){
-    var i = 5
+    var i = 5;
 }
-i // = 5 - not undefined as you'd expect in a block-scoped language
+i; // = 5 - not undefined as you'd expect in a block-scoped language
 
 // This has led to a common pattern of "immediately-executing anonymous
 // functions", which prevent temporary variables from leaking into the global
 // scope.
 (function(){
-    var temporary = 5
+    var temporary = 5;
     // We can access the global scope by assiging to the 'global object', which
     // in a web browser is always 'window'. The global object may have a
     // different name in non-browser environments such as Node.js.
-    window.permanent = 10
-    // Or, as previously mentioned, we can just leave the var keyword off.
-    permanent2 = 15
-})()
-temporary // raises ReferenceError
-permanent // = 10
-permanent2 // = 15
+    window.permanent = 10;
+})();
+temporary; // raises ReferenceError
+permanent; // = 10
 
 // One of JavaScript's most powerful features is closures. If a function is
 // defined inside another function, the inner function has access to all the
-// outer function's variables.
+// outer function's variables, even after the outer function exits.
 function sayHelloInFiveSeconds(name){
-    var prompt = "Hello, " + name + "!"
+    var prompt = "Hello, " + name + "!";
     function inner(){
-        alert(prompt)
+        alert(prompt);
     }
-    setTimeout(inner, 5000)
-    // setTimeout is asynchronous, so this function will finish without waiting
-    // 5 seconds. However, once the 5 seconds is up, inner will still have
-    // access to the value of prompt.
+    setTimeout(inner, 5000);
+    // setTimeout is asynchronous, so the sayHelloInFiveSeconds function will
+    // exit immediately, and setTimeout will call inner afterwards. However,
+    // because inner is "closed over" sayHelloInFiveSeconds, inner still has
+    // access to the 'prompt' variable when it is finally called.
 }
-sayHelloInFiveSeconds("Adam") // will open a popup with "Hello, Adam!" in 5s
+sayHelloInFiveSeconds("Adam"); // will open a popup with "Hello, Adam!" in 5s
 
 ///////////////////////////////////
 // 5. More about Objects; Constructors and Prototypes
@@ -275,44 +267,44 @@ sayHelloInFiveSeconds("Adam") // will open a popup with "Hello, Adam!" in 5s
 // Objects can contain functions.
 var myObj = {
     myFunc: function(){
-        return "Hello world!"
+        return "Hello world!";
     }
-}
-myObj.myFunc() // = "Hello world!"
+};
+myObj.myFunc(); // = "Hello world!"
 
 // When functions attached to an object are called, they can access the object
 // they're attached to using the this keyword.
 myObj = {
     myString: "Hello world!",
     myFunc: function(){
-        return this.myString
+        return this.myString;
     }
-}
-myObj.myFunc() // = "Hello world!"
+};
+myObj.myFunc(); // = "Hello world!"
 
 // What this is set to has to do with how the function is called, not where
 // it's defined. So, our function doesn't work if it isn't called in the
 // context of the object.
-var myFunc = myObj.myFunc
-myFunc() // = undefined
+var myFunc = myObj.myFunc;
+myFunc(); // = undefined
 
 // Inversely, a function can be assigned to the object and gain access to it
 // through this, even if it wasn't attached when it was defined.
 var myOtherFunc = function(){
-    return this.myString.toUpperCase()
+    return this.myString.toUpperCase();
 }
-myObj.myOtherFunc = myOtherFunc
-myObj.myOtherFunc() // = "HELLO WORLD!"
+myObj.myOtherFunc = myOtherFunc;
+myObj.myOtherFunc(); // = "HELLO WORLD!"
 
 // When you call a function with the new keyword, a new object is created, and
 // made available to the function via this. Functions designed to be called
 // like this are called constructors.
 
 var MyConstructor = function(){
-    this.myNumber = 5
+    this.myNumber = 5;
 }
-myNewObj = new MyConstructor() // = {myNumber: 5}
-myNewObj.myNumber // = 5
+myNewObj = new MyConstructor(); // = {myNumber: 5}
+myNewObj.myNumber; // = 5
 
 // Every JavaScript object has a 'prototype'. When you go to access a property
 // on an object that doesn't exist on the actual object, the interpreter will
@@ -323,31 +315,31 @@ myNewObj.myNumber // = 5
 // part of the standard; we'll get to standard ways of using prototypes later.
 var myObj = {
     myString: "Hello world!",
-}
+};
 var myPrototype = {
     meaningOfLife: 42,
     myFunc: function(){
         return this.myString.toLowerCase()
     }
-}
-myObj.__proto__ = myPrototype
-myObj.meaningOfLife // = 42
+};
+myObj.__proto__ = myPrototype;
+myObj.meaningOfLife; // = 42
 
 // This works for functions, too.
-myObj.myFunc() // = "hello world!"
+myObj.myFunc(); // = "hello world!"
 
 // Of course, if your property isn't on your prototype, the prototype's
 // prototype is searched, and so on.
 myPrototype.__proto__ = {
     myBoolean: true
-}
-myObj.myBoolean // = true
+};
+myObj.myBoolean; // = true
 
 // There's no copying involved here; each object stores a reference to its
 // prototype. This means we can alter the prototype and our changes will be
 // reflected everywhere.
-myPrototype.meaningOfLife = 43
-myObj.meaningOfLife // = 43
+myPrototype.meaningOfLife = 43;
+myObj.meaningOfLife; // = 43
 
 // We mentioned that __proto__ was non-standard, and there's no standard way to
 // change the prototype of an existing object. However, there's two ways to
@@ -355,8 +347,8 @@ myObj.meaningOfLife // = 43
 
 // The first is Object.create, which is a recent addition to JS, and therefore
 // not available in all implementations yet.
-var myObj = Object.create(myPrototype)
-myObj.meaningOfLife // = 43
+var myObj = Object.create(myPrototype);
+myObj.meaningOfLife; // = 43
 
 // The second way, which works anywhere, has to do with constructors.
 // Constructors have a property called prototype. This is *not* the prototype of
@@ -366,20 +358,20 @@ myConstructor.prototype = {
     getMyNumber: function(){
         return this.myNumber
     }
-}
-var myNewObj2 = new myConstructor()
-myNewObj2.getMyNumber() // = 5
+};
+var myNewObj2 = new myConstructor();
+myNewObj2.getMyNumber(); // = 5
 
 // Built-in types like strings and numbers also have constructors that create
 // equivalent wrapper objects.
-var myNumber = 12
-var myNumberObj = new Number(12)
-myNumber == myNumberObj // = true
+var myNumber = 12;
+var myNumberObj = new Number(12);
+myNumber == myNumberObj; // = true
 
 // Except, they aren't exactly equivalent.
-typeof(myNumber) // = 'number'
-typeof(myNumberObj) // = 'object'
-myNumber === myNumberObj // = false
+typeof(myNumber); // = 'number'
+typeof(myNumberObj); // = 'object'
+myNumber === myNumberObj; // = false
 if (0){
     // This code won't execute, because 0 is falsy.
 }
@@ -390,9 +382,9 @@ if (Number(0)){
 // However, the wrapper objects and the regular builtins share a prototype, so
 // you can actually add functionality to a string, for instance.
 String.prototype.firstCharacter = function(){
-    return this.charAt(0)
+    return this.charAt(0);
 }
-"abc".firstCharacter() // = "a"
+"abc".firstCharacter(); // = "a"
 
 // This fact is often used in "polyfilling", which is implementing newer
 // features of JavaScript in an older subset of JavaScript, so that they can be
@@ -403,10 +395,10 @@ String.prototype.firstCharacter = function(){
 if (Object.create === undefined){ // don't overwrite it if it exists
     Object.create = function(proto){
         // make a temporary constructor with the right prototype
-        var Constructor = function(){}
-        Constructor.prototype = proto
+        var Constructor = function(){};
+        Constructor.prototype = proto;
         // then use it to create a new, appropriately-prototyped object
-        return new Constructor()
+        return new Constructor();
     }
 }
 ```
diff --git a/ko-kr/java-kr.html.markdown b/ko-kr/java-kr.html.markdown
index d00775ae..76b05e45 100644
--- a/ko-kr/java-kr.html.markdown
+++ b/ko-kr/java-kr.html.markdown
@@ -1,5 +1,6 @@
 ---
 language: java
+filename: java-kr.java
 category: language
 contributors:
     - ["Jake Prather", "http://github.com/JakeHP"]
@@ -26,7 +27,8 @@ import java.util.ArrayList;
 // java.security 패키지 안에 있는 모든 클래스를 임포트합니다.
 import java.security.*;
 
-// 각 .java 파일에는 공용(public) 클래스가 들어 있으며, 클래스의 이름은 파일명과 동일합니다.
+// 각 .java 파일에는 공용(public) 클래스가 들어 있으며, 클래스의 이름은
+// 파일명과 동일합니다.
 public class LearnJava {
 
     // 프로그램에는 반드시 진입점 역할을 하는 main 메서드가 하나 있어야 합니다.
@@ -253,8 +255,13 @@ public class LearnJava {
         // String
 
         // 형변환
+<<<<<<< HEAD
         // 자바 객체 또한 형변환할 수 있으며, 이와 관련해서 알아야 할 세부사항이 많을뿐더러
         // 다소 중급 수준에 해당하는 개념들도 다뤄야 합니다.
+=======
+        // 자바 객체 또한 형변환할 수 있으며, 이와 관련해서 알아야 할 세부사항이
+        // 많을뿐더러 다소 중급 수준에 해당하는 개념들도 다뤄야 합니다.
+>>>>>>> f33dea8b83bf64ecde36337a5e02cae77f5210de
         // 이와 관련된 사항은 아래 링크를 참고하세요.
         // http://docs.oracle.com/javase/tutorial/java/IandI/subclasses.html
 
@@ -403,4 +410,4 @@ class PennyFarthing extends Bicycle {
 
 * [제네릭(Generics)](http://docs.oracle.com/javase/tutorial/java/generics/index.html)
 
-* [자바 코딩 관례(Java Code Conventions)](http://www.oracle.com/technetwork/java/codeconv-138413.html)
\ No newline at end of file
+* [자바 코딩 관례(Java Code Conventions)](http://www.oracle.com/technetwork/java/codeconv-138413.html)
diff --git a/ko-kr/lua-kr.html.markdown b/ko-kr/lua-kr.html.markdown
index 7e8c2bc0..04d119c4 100644
--- a/ko-kr/lua-kr.html.markdown
+++ b/ko-kr/lua-kr.html.markdown
@@ -1,4 +1,4 @@
----
+---
 language: lua
 category: language
 contributors:
@@ -395,6 +395,7 @@ g()  -- 343이 출력됩니다. 그전까지는 아무것도 출력되지 않습
 --]]
 
 ```
+
 ## 참고자료
 
 루아를 배우는 일이 흥미진진했던 이유는 <a href="http://love2d.org/">Love 2D 게임 엔진</a>을 이용해 
diff --git a/objective-c.html.markdown b/objective-c.html.markdown
new file mode 100644
index 00000000..9e9f43e7
--- /dev/null
+++ b/objective-c.html.markdown
@@ -0,0 +1,310 @@
+---
+
+language: Objective-C
+contributors:
+    - ["Eugene Yagrushkin", "www.about.me/yagrushkin"]
+    - ["Yannick Loriot", "https://github.com/YannickL"]
+filename: LearnObjectiveC.m
+
+---
+
+Objective-C is the main programming language used by Apple for the OS X and iOS operating systems and their respective frameworks, Cocoa and Cocoa Touch.
+It is a general-purpose, object-oriented programming language that adds Smalltalk-style messaging to the C programming language. 
+
+```cpp
+// Single-line comments start with //
+
+/*
+Multi-line comments look like this.
+*/
+
+// Imports the Foundation headers with #import
+#import <Foundation/Foundation.h>
+#import "MyClass.h"
+
+// Your program's entry point is a function called
+// main with an integer return type.
+int main (int argc, const char * argv[])
+{
+    // Create an autorelease pool to manage the memory into the program
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+ 
+    // Use NSLog to print lines to the console
+    NSLog(@"Hello World!"); // Print the string "Hello World!"
+ 
+    ///////////////////////////////////////
+    // Types & Variables
+    ///////////////////////////////////////
+    
+    // Primitive declarations
+    int myPrimitive1  = 1;
+    long myPrimitive2 = 234554664565;
+    
+    // Object declarations
+    // Put the * in front of the variable names for strongly-typed object declarations
+    MyClass *myObject1 = nil;  // Strong typing
+    id       myObject2 = nil;  // Weak typing
+    // %@ is an object
+    // 'description' is a convention to display the value of the Objects
+    NSLog(@"%@ and %@", myObject1, [myObject2 description]); // Print "(null) and (null)"
+    
+    // String
+    NSString *worldString = @"World";
+    NSLog(@"Hello %@!", worldString); // Print "Hello World!"
+    
+    // Character literals
+    NSNumber *theLetterZNumber = @'Z';
+    char theLetterZ            = [theLetterZNumber charValue];
+    NSLog(@"%c", theLetterZ);
+
+    // Integral literals
+    NSNumber *fortyTwoNumber = @42;
+    int fortyTwo             = [fortyTwoNumber intValue];
+    NSLog(@"%i", fortyTwo);
+    
+    NSNumber *fortyTwoUnsignedNumber = @42U;
+    unsigned int fortyTwoUnsigned    = [fortyTwoUnsignedNumber unsignedIntValue];
+    NSLog(@"%u", fortyTwoUnsigned);
+    
+    NSNumber *fortyTwoShortNumber = [NSNumber numberWithShort:42];
+    short fortyTwoShort           = [fortyTwoShortNumber shortValue];
+    NSLog(@"%hi", fortyTwoShort);
+    
+    NSNumber *fortyTwoLongNumber = @42L;
+    long fortyTwoLong            = [fortyTwoLongNumber longValue];
+    NSLog(@"%li", fortyTwoLong);
+
+    // Floating point literals
+    NSNumber *piFloatNumber = @3.141592654F;
+    float piFloat           = [piFloatNumber floatValue];
+    NSLog(@"%f", piFloat);
+    
+    NSNumber *piDoubleNumber = @3.1415926535;
+    piDouble                 = [piDoubleNumber doubleValue];
+    NSLog(@"%f", piDouble);
+
+    // BOOL literals
+    NSNumber *yesNumber = @YES;
+    NSNumber *noNumber  = @NO;
+
+    // Array object
+    NSArray *anArray      = @[@1, @2, @3, @4];
+    NSNumber *thirdNumber = anArray[2];
+    NSLog(@"Third number = %@", thirdNumber); // Print "Third number = 3"
+
+    // Dictionary object
+    NSDictionary *aDictionary = @{ @"key1" : @"value1", @"key2" : @"value2" };
+    NSObject *valueObject     = aDictionary[@"A Key"];
+    NSLog(@"Object = %@", valueObject); // Print "Object = (null)"
+
+    ///////////////////////////////////////
+    // Operators
+    ///////////////////////////////////////
+    
+    // The operators works like in the C language
+    // For example:
+    2 + 5; // => 7
+    4.2f + 5.1f; // => 9.3f
+    3 == 2; // => 0 (NO)
+    3 != 2; // => 1 (YES)
+    1 && 1; // => 1 (Logical and)
+    0 || 1; // => 1 (Logical or)
+    ~0x0F; // => 0xF0 (bitwise negation)
+    0x0F & 0xF0; // => 0x00 (bitwise AND)
+    0x01 << 1; // => 0x02 (bitwise left shift (by 1))
+
+    ///////////////////////////////////////
+    // Control Structures
+    ///////////////////////////////////////
+
+    // If-Else statement
+    if (NO)
+    {
+        NSLog(@"I am never run");
+    } else if (0)
+    {
+        NSLog(@"I am also never run");
+    } else
+    {
+        NSLog(@"I print");
+    }
+
+    // Switch statement
+    switch (2)
+    {
+        case 0:
+        {
+            NSLog(@"I am never run");
+        } break;
+        case 1:
+        {
+            NSLog(@"I am also never run");
+        } break;
+        default:
+        {
+            NSLog(@"I print");
+        } break;
+    }
+    
+    // While loops statements
+    int ii = 0;
+    while (ii < 4)
+    {
+        NSLog(@"%d,", ii++); // ii++ increments ii in-place, after using its value.
+    } // => prints "0," 
+      //           "1,"
+      //           "2,"
+      //           "3,"
+
+    // For loops statements
+    int jj;
+    for (jj=0; jj < 4; jj++)
+    {
+        NSLog(@"%d,", jj++);
+    } // => prints "0," 
+      //           "1,"
+      //           "2,"
+      //           "3,"
+     
+    // Foreach statements             
+    NSArray *values = @[@0, @1, @2, @3];
+    for (NSNumber *value in values)
+    {
+        NSLog(@"%@,", value);
+    } // => prints "0," 
+      //           "1,"
+      //           "2,"
+      //           "3,"
+
+    // Try-Catch-Finally statements
+    @try
+    {
+        // Your statements here
+        @throw [NSException exceptionWithName:@"FileNotFoundException"
+                            reason:@"File Not Found on System" userInfo:nil];
+    } @catch (NSException * e)
+    {
+        NSLog(@"Exception: %@", e);
+    } @finally
+    {
+        NSLog(@"Finally");
+    } // => prints "Exception: File Not Found on System"
+      //           "Finally"
+ 
+    ///////////////////////////////////////
+    // Objects
+    ///////////////////////////////////////
+    
+    // Create an object instance by allocating memory and initializing it.
+    // An object is not fully functional until both steps have been completed.
+    MyClass *myObject = [[MyClass alloc] init];
+        
+    // The Objective-C model of object-oriented programming is based on message
+    // passing to object instances. 
+    // In Objective-C one does not simply call a method; one sends a message.
+    [myObject instanceMethodWithParameter:@"Steve Jobs"];
+
+    // Clean up the memory you used into your program
+    [pool drain];
+    
+    // End the program
+    return 0;
+}
+
+///////////////////////////////////////
+// Classes And Functions
+///////////////////////////////////////
+
+// Declare your class in a header(MyClass.h) file:
+// Class Declaration Syntax:
+// @interface ClassName : ParentClassName <ImplementedProtocols>
+// {
+//    Member variable declarations;
+// }
+// -/+ (type) Method declarations;
+// @end
+@interface MyClass : NSObject <MyCustomProtocol>
+{
+    int count;
+    id data;
+    NSString *name;
+}
+// Convenience notation to auto generate public getter and setter
+@property int count;
+@property (copy) NSString *name; // Copy the object during assignment.
+@property (readonly) id data;    // Declare only a getter method.
+
+// Methods
++/- (return type)methodSignature:(Parameter Type *)parameterName;
+
+// + for class method
++ (NSString *)classMethod;
+
+// - for instance method
+- (NSString *)instanceMethodWithParmeter:(NSString *)string;
+- (NSNumber *)methodAParameterAsString:(NSString*)string andAParameterAsNumber:(NSNumber *)number;
+
+@end
+
+// Implement the methods in an implementation (MyClass.m) file:
+
+@implementation UserObject
+
+// Call when the object is releasing
+- (void)dealloc
+{
+}
+
+// Constructors are a way of creating classes
+// This is a default constructor which is called when the object is creating
+- (id)init
+{
+    if ((self = [super init]))
+    {
+        self.count = 1;
+    }
+    return self;
+}
+
++ (NSString *)classMethod
+{
+    return [[self alloc] init];
+}
+
+- (NSString *)instanceMethodWithParmeter:(NSString *)string
+{
+    return @"New string";
+}
+
+- (NSNumber *)methodAParameterAsString:(NSString*)string andAParameterAsNumber:(NSNumber *)number
+{
+    return @42;
+}
+
+// Methods declared into MyProtocol
+- (void)myProtocolMethod
+{
+    // statements
+}
+
+@end
+
+/*
+ * A protocol declares methods that can be implemented by any class.
+ * Protocols are not classes themselves. They simply define an interface
+ * that other objects are responsible for implementing.
+ */
+@protocol MyProtocol
+    - (void)myProtocolMethod;
+@end
+
+
+
+```
+## Further Reading
+
+[Wikipedia Objective-C](http://en.wikipedia.org/wiki/Objective-C)
+
+[Learning Objective-C](http://developer.apple.com/library/ios/referencelibrary/GettingStarted/Learning_Objective-C_A_Primer/)
+
+[iOS For High School Students: Getting Started](http://www.raywenderlich.com/5600/ios-for-high-school-students-getting-started)
diff --git a/php.html.markdown b/php.html.markdown
index ce228870..083574ee 100644
--- a/php.html.markdown
+++ b/php.html.markdown
@@ -440,6 +440,11 @@ class MyClass
 
     static $staticVar   = 'static';
 
+    // Static variables and their visibility
+    public static $publicStaticVar = 'publicStatic';
+    private static $privateStaticVar = 'privateStatic'; // Accessible within the class only
+    protected static $protectedStaticVar = 'protectedStatic'; // Accessible from the class and subclasses
+
     // Properties must declare their visibility
     public $property    = 'public';
     public $instanceProp;
diff --git a/pt-br/elisp-pt.html.markdown b/pt-br/elisp-pt.html.markdown
new file mode 100644
index 00000000..fc2d1e40
--- /dev/null
+++ b/pt-br/elisp-pt.html.markdown
@@ -0,0 +1,359 @@
+---
+language: elisp
+contributors:
+    - ["Bastien Guerry", "http://bzg.fr"]
+translators:
+    - ["Lucas Tadeu Teixeira", "http://ltt.me"]
+lang: pt-br
+filename: learn-emacs-lisp-pt.el
+---
+
+```scheme
+;; Introdução ao Emacs Lisp em 15 minutos (v0.2d)
+;;
+;; Autor: Bastien / @bzg2 / http://bzg.fr
+;;
+;; Antes de começar, leia este texto escrito Peter Norvig:
+;; http://norvig.com/21-days.html
+;;
+;; Agora instale GNU Emacs 24.3:
+;;
+;; Debian: apt-get install emacs (ou veja as instruções da sua distribuição)
+;; OSX: http://emacsformacosx.com/emacs-builds/Emacs-24.3-universal-10.6.8.dmg
+;; Windows: http://ftp.gnu.org/gnu/windows/emacs/emacs-24.3-bin-i386.zip
+;;
+;; Informações mais gerais podem ser encontradas em:
+;; http://www.gnu.org/software/emacs/#Obtaining
+
+;; Aviso importante:
+;;
+;; Realizar este tutorial não danificará seu computador, a menos
+;; que você fique tão irritado a ponto de jogá-lo no chão. Neste caso,
+;; me abstenho de qualquer responsabilidade. Divirta-se!
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Abra o Emacs.
+;;
+;; Aperte a tecla `q' para ocultar a mensagem de boas vindas.
+;;
+;; Agora olhe para a linha cinza na parte inferior da janela:
+;;
+;; "*scratch*" é o nome do espaço de edição em que você se encontra.
+;; Este espaço de edição é chamado "buffer".
+;;
+;; O buffer de rascunho (i.e., "scratch") é o buffer padrão quando
+;; o Emacs é aberto. Você nunca está editando arquivos: você está
+;; editando buffers que você pode salvar em um arquivo.
+;;
+;; "Lisp interaction" refere-se a um conjunto de comandos disponíveis aqui.
+;;
+;; O Emacs possui um conjunto de comandos embutidos (disponíveis em
+;; qualquer buffer) e vários subconjuntos de comandos disponíveis
+;; quando você ativa um modo específico. Aqui nós utilizamos
+;; `lisp-interaction-mode', que possui comandos para interpretar e navegar
+;; em código Elisp.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Pontos e vírgulas iniciam comentários em qualquer parte de uma linha.
+;;
+;; Programas codificados em Elisp são compostos por expressões simbólicas
+;; (conhecidas também por "sexps"):
+(+ 2 2)
+
+;; Esta expressão simbólica significa "Some 2 e 2".
+
+;; "Sexps" são envoltas em parêntese, possivelmente aninhados:
+(+ 2 (+ 1 1))
+
+;; Uma expressão simbólica contém átomos ou outras expressões
+;; simbólicas. Nos exemplos acima, 1 e 2 são átomos;
+;; (+ 2 (+ 1 1)) e (+ 1 1) são expressões simbólicas.
+
+;; No modo `lisp-interaction-mode' você pode interpretar "sexps".
+;; Posicione o cursor logo após o parêntese de fechamento e,
+;; então, segure apertado Ctrl e aperte a tecla j ("C-j", em resumo).
+
+(+ 3 (+ 1 2))
+;;           ^ posicione o cursor aqui
+;; `C-j' => 6
+
+;; `C-j' insere o resultado da interpretação da expressão no buffer.
+
+;; `C-xC-e' exibe o mesmo resultado na linha inferior do Emacs,
+;; chamada de "mini-buffer".  Nós geralmente utilizaremos `C-xC-e',
+;; já que não queremos poluir o buffer com texto desnecessário.
+
+;; `setq' armazena um valor em uma variável:
+(setq my-name "Bastien")
+;; `C-xC-e' => "Bastien" (texto exibido no mini-buffer)
+
+;; `insert' insere "Hello!" na posição em que se encontra seu cursor:
+(insert "Hello!")
+;; `C-xC-e' => "Hello!"
+
+;; Nós executamos `insert' com apenas um argumento ("Hello!"), mas
+;; mais argumentos podem ser passados --  aqui utilizamos dois:
+
+(insert "Hello" " world!")
+;; `C-xC-e' => "Hello world!"
+
+;; Você pode utilizar variávies no lugar de strings:
+(insert "Hello, I am " my-name)
+;; `C-xC-e' => "Hello, I am Bastien"
+
+;; Você pode combinar "sexps" em funções:
+(defun hello () (insert "Hello, I am " my-name))
+;; `C-xC-e' => hello
+
+;; Você pode interpretar chamadas de funções:
+(hello)
+;; `C-xC-e' => Hello, I am Bastien
+
+;; Os parêntesis vazios na definição da função significam que ela
+;; não aceita argumentos. Mas sempre utilizar `my-name' é um tédio!
+;; Vamos dizer à função para aceitar um argumento (o argumento é
+;; chamado "name"):
+
+(defun hello (name) (insert "Hello " name))
+;; `C-xC-e' => hello
+
+;; Agora vamos executar a função com a string "you" como o valor
+;; para seu único parâmetro:
+(hello "you")
+;; `C-xC-e' => "Hello you"
+
+;; Aí sim!
+
+;; Respire um pouco.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Agora mude para um novo buffer chamado "*test*":
+
+(switch-to-buffer-other-window "*test*")
+;; `C-xC-e'
+;; => [a tela exibirá duas janelas e o cursor estará no buffer *test*]
+
+;; Posicione o mouse sobre a janela superior e clique com o botão
+;; esquerdo para voltar. Ou você pode utilizar `C-xo' (i.e. segure
+;; ctrl-x e aperte o) para voltar para a outra janela, de forma interativa.
+
+;; Você pode combinar várias "sexps" com `progn':
+(progn
+  (switch-to-buffer-other-window "*test*")
+  (hello "you"))
+;; `C-xC-e'
+;; => [A tela exibirá duas janelas e o cursor estará no buffer *test*]
+
+;; Agora, se você não se importar, pararei de pedir que você aperte
+;; `C-xC-e': faça isso para cada "sexp" que escrevermos.
+
+;; Sempre volte para o buffer *scratch* com o mouse ou `C-xo'.
+
+;; Frequentemente, é útil apagar o conteúdo do buffer:
+(progn
+  (switch-to-buffer-other-window "*test*")
+  (erase-buffer)
+  (hello "there"))
+
+;; Ou voltar para a outra janela:
+(progn
+  (switch-to-buffer-other-window "*test*")
+  (erase-buffer)
+  (hello "you")
+  (other-window 1))
+
+;; Você pode armazenar um valor em uma variável local utilizando `let':
+(let ((local-name "you"))
+  (switch-to-buffer-other-window "*test*")
+  (erase-buffer)
+  (hello local-name)
+  (other-window 1))
+
+;; Neste caso, não é necessário utilizar `progn' já que `let' combina
+;; várias "sexps".
+
+;; Vamos formatar uma string:
+(format "Hello %s!\n" "visitor")
+
+;; %s é um espaço reservado para uma string, substituído por "visitor".
+;; \n é um caractere de nova linha.
+
+;; Vamos refinar nossa função utilizando `format':
+(defun hello (name)
+  (insert (format "Hello %s!\n" name)))
+
+(hello "you")
+
+;; Vamos criar outra função que utilize `let':
+(defun greeting (name)
+  (let ((your-name "Bastien"))
+    (insert (format "Hello %s!\n\nI am %s."
+                    name       ; the argument of the function
+                    your-name  ; the let-bound variable "Bastien"
+                    ))))
+
+;; E executá-la:
+(greeting "you")
+
+;; Algumas funções são interativas:
+(read-from-minibuffer "Enter your name: ")
+
+;; Ao ser interpretada, esta função retorna o que você digitou no prompt.
+
+;; Vamos fazer nossa função `greeting' pedir pelo seu nome:
+(defun greeting (from-name)
+  (let ((your-name (read-from-minibuffer "Enter your name: ")))
+    (insert (format "Hello!\n\nI am %s and you are %s."
+                    from-name ; the argument of the function
+                    your-name ; the let-bound var, entered at prompt
+                    ))))
+
+(greeting "Bastien")
+
+;; Vamos finalizá-la fazendo-a exibir os resultados em outra janela:
+(defun greeting (from-name)
+  (let ((your-name (read-from-minibuffer "Enter your name: ")))
+    (switch-to-buffer-other-window "*test*")
+    (erase-buffer)
+    (insert (format "Hello %s!\n\nI am %s." your-name from-name))
+    (other-window 1)))
+
+;; Agora teste-a:
+(greeting "Bastien")
+
+;; Respire um pouco.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Vamos armazenar uma lista de nomes:
+(setq list-of-names '("Sarah" "Chloe" "Mathilde"))
+
+;; Pegue o primeiro elemento desta lista utilizando `car':
+(car list-of-names)
+
+;; Pegue uma lista de todos os elementos, exceto o primeiro, utilizando
+;; `cdr':
+(cdr list-of-names)
+
+;; Adicione um elemento ao início da lista com `push':
+(push "Stephanie" list-of-names)
+
+;; NOTA: `car' e `cdr' não modificam a lista, `push' sim.
+;; Esta é uma diferença importante: algumas funções não têm qualquer
+;; efeito colateral (como `car'), enquanto outras sim (como `push').
+
+;; Vamos executar `hello' para cada elemento em `list-of-names':
+(mapcar 'hello list-of-names)
+
+;; Refine `greeting' para saudar todos os nomes em `list-of-names':
+(defun greeting ()
+    (switch-to-buffer-other-window "*test*")
+    (erase-buffer)
+    (mapcar 'hello list-of-names)
+    (other-window 1))
+
+(greeting)
+
+;; Você se lembra da função `hello' que nós definimos lá em cima? Ela
+;; recebe um argumento, um nome. `mapcar' executa `hello', sucessivamente,
+;; utilizando cada elemento de `list-of-names' como argumento para `hello'.
+
+;; Agora vamos arrumar, um pouco, o que nós temos escrito no buffer:
+
+(defun replace-hello-by-bonjour ()
+    (switch-to-buffer-other-window "*test*")
+    (goto-char (point-min))
+    (while (search-forward "Hello")
+      (replace-match "Bonjour"))
+    (other-window 1))
+
+;; (goto-char (point-min)) vai para o início do buffer.
+;; (search-forward "Hello") busca pela string "Hello".
+;; (while x y) interpreta a(s) sexp(s) y enquanto x retornar algo.
+;; Se x retornar `nil' (nada), nós saímos do laço.
+
+(replace-hello-by-bonjour)
+
+;; Você deveria ver todas as ocorrências de "Hello" no buffer *test*
+;; substituídas por "Bonjour".
+
+;; Você deveria, também, receber um erro: "Search failed: Hello".
+;;
+;; Para evitar este erro, você precisa dizer ao `search-forward' se ele
+;; deveria parar de buscar em algum ponto no buffer, e se ele deveria
+;; falhar de forma silenciosa quando nada fosse encontrado:
+
+;; (search-forward "Hello" nil t) dá conta do recado:
+
+;; O argumento `nil' diz: a busca não está limitada a uma posição.
+;; O argumento `t' diz: falhe silenciosamente quando nada for encontrado.
+
+;; Nós utilizamos esta "sexp" na função abaixo, que não gera um erro:
+
+(defun hello-to-bonjour ()
+    (switch-to-buffer-other-window "*test*")
+    (erase-buffer)
+    ;; Say hello to names in `list-of-names'
+    (mapcar 'hello list-of-names)
+    (goto-char (point-min))
+    ;; Replace "Hello" by "Bonjour"
+    (while (search-forward "Hello" nil t)
+      (replace-match "Bonjour"))
+    (other-window 1))
+
+(hello-to-bonjour)
+
+;; Vamos colorir os nomes:
+
+(defun boldify-names ()
+    (switch-to-buffer-other-window "*test*")
+    (goto-char (point-min))
+    (while (re-search-forward "Bonjour \\(.+\\)!" nil t)
+      (add-text-properties (match-beginning 1)
+                           (match-end 1)
+                           (list 'face 'bold)))
+    (other-window 1))
+
+;; Esta função introduz `re-search-forward': ao invés de buscar
+;; pela string "Bonjour", você busca por um padrão utilizando uma
+;; "expressão regular" (abreviada pelo prefixo "re-").
+
+;; A expressão regular é "Bonjour \\(.+\\)!" e lê-se:
+;; a string "Bonjour ", e
+;; um grupo de               | que é o \\( ... \\)
+;;   quaisquer caracteres    | que é o .
+;;   possivelmente repetidos | que é o +
+;; e a string "!".
+
+;; Preparado? Teste!
+
+(boldify-names)
+
+;; `add-text-properties' adiciona... propriedades de texto, como uma fonte.
+
+;; OK, terminamos por aqui. Feliz Hacking!
+
+;; Se você quiser saber mais sobre uma variável ou função:
+;;
+;; C-h v uma-variável RET
+;; C-h f uma-função RET
+;;
+;; Para ler o manual de Emacs Lisp que vem com o Emacs:
+;;
+;; C-h i m elisp RET
+;;
+;; Para ler uma introdução online ao Emacs Lisp:
+;; https://www.gnu.org/software/emacs/manual/html_node/eintr/index.html
+
+;; Agradecimentos a estas pessoas por seu feedback e sugestões:
+;; - Wes Hardaker
+;; - notbob
+;; - Kevin Montuori
+;; - Arne Babenhauserheide
+;; - Alan Schmitt
+;; - LinXitoW
+;; - Aaron Meurer
+```
diff --git a/pt-br/python-pt.html.markdown b/pt-br/python-pt.html.markdown
index e08bb5a8..5afd46d0 100644
--- a/pt-br/python-pt.html.markdown
+++ b/pt-br/python-pt.html.markdown
@@ -4,7 +4,7 @@ contributors:
     - ["Louie Dinh", "http://ldinh.ca"]
 translators:
     - ["Vilson Vieira", "http://automata.cc"]
-lang: pt-bf
+lang: pt-br
 filename: learnpython-pt.py
 ---
 
diff --git a/pt-br/ruby-pt.html.markdown b/pt-br/ruby-pt.html.markdown
new file mode 100644
index 00000000..484bb0dd
--- /dev/null
+++ b/pt-br/ruby-pt.html.markdown
@@ -0,0 +1,386 @@
+---
+language: ruby
+lang: br-pt
+filename: learnruby.rb
+contributors:
+  - ["Bruno Henrique - Garu", "http://garulab.com"]
+  - ["Katyanna Moura", "https://twitter.com/amelie_kn"]
+---
+
+```ruby
+# Isso é um comentário
+
+=begin
+Isso é um comentário multilinha
+Ninguém os usa
+Você não deve usar também
+=end
+
+# Primeiro e principal: Tudo é um objeto.
+
+# Números são objetos
+
+3.class #=> Fixnum
+
+3.to_s #=> "3"
+
+
+# Um pouco de aritmética básica
+
+1 + 1 #=> 2
+8 - 1 #=> 7
+10 * 2 #=> 20
+35 / 5 #=> 7
+
+# Aritimética é apenas açúcar sintático
+# para chamar um método de um objeto
+1.+(3) #=> 4
+10.* 5 #=> 50
+
+# Valores especiais são objetos
+nil # Nada para ver aqui
+true # verdadeiro
+false # falso
+
+nil.class #=> NilClass
+true.class #=> TrueClass
+false.class #=> FalseClass
+
+# Igualdade
+1 == 1 #=> true
+2 == 1 #=> false
+
+# Desigualdade
+1 != 1 #=> false
+2 != 1 #=> true
+!true  #=> false
+!false #=> true
+
+# além de 'false', 'nil' é o único outro valor falso
+
+!nil   #=> true
+!false #=> true
+!0     #=> false
+
+# Mais comparações
+1 < 10 #=> true
+1 > 10 #=> false
+2 <= 2 #=> true
+2 >= 2 #=> true
+
+# Strings são objects
+
+'Eu sou uma string'.class #=> String
+"Eu também sou uma string".class #=> String
+
+placeholder = "usar interpolação de string"
+"Eu posso #{placeholder} quando estiver usando aspas duplas"
+#=> "Eu posso usar insterpolação de string quando estiver usando aspas duplas"
+
+# imprime para output (saída)
+puts "Estou imprimindo"
+
+# Variáveis
+x = 25 #=> 25
+x #=> 25
+
+# Note que uma atribuição retorna o valor atribuido
+# Isso significa que você pode fazer múltiplas atribuições:
+
+x = y = 10 #=> 10
+x #=> 10
+y #=> 10
+
+# Por convenção, use snake_case para nomes de variáveis
+snake_case = true
+
+# Use nomes de variáveis descritivos
+caminho_para_a_raiz_do_projeto = '/bom/nome/'
+caminho = '/nome/ruim/'
+
+# Símbolos (são objetos)
+# Símbolos são imutáveis, são constantes reutilizáveis representadadas
+# internamente por um valor inteiro. Eles são frequentemente usados no
+# lugar de strings para transmitir com eficiência os valores específicos
+# e significativos
+
+:pendente.class #=> Symbol
+
+status = :pendente
+
+status == :pendente #=> true
+
+status == 'pendente' #=> false
+
+status == :aprovado #=> false
+
+# Arrays
+
+# Isso é um array
+[1, 2, 3, 4, 5] #=> [1, 2, 3, 4, 5]
+
+# Arrays podem conter diferentes tipos de itens
+
+array = [1, "Oi", false] #=> => [1, "Oi", false]
+
+# Arrays podem ser indexados
+# a partir do começo
+array[0] #=> 1
+array[12] #=> nil
+
+# Como aritimética, o acesso via [var]
+# é apenas açúcar sintático
+# para chamar o método [] de um objeto
+array.[] 0 #=> 1
+array.[] 12 #=> nil
+
+# a partir do final
+array[-1] #=> 5
+
+# Com um índice de começo e fim
+array[2, 4] #=> [3, 4, 5]
+
+# Ou com um intervalo de valores
+array[1..3] #=> [2, 3, 4]
+
+# Adicionar a um array como este
+array << 6 #=> [1, 2, 3, 4, 5, 6]
+
+# Hashes são o principal dicionário de Ruby com pares de chaves(keys)/valor(value).
+# Hashes são simbolizados com chaves "{}"
+hash = {'cor' => 'verde', 'numero' => 5}
+
+hash.keys #=> ['cor', 'numero']
+
+# Hashes podem ser rapidamente pesquisados pela chave (key)
+hash['cor'] #=> 'verde'
+hash['numero'] #=> 5
+
+# Procurar em um hash por uma chave que não existe retorna nil:
+hash['nada aqui'] #=> nil
+
+# Interar sobre hashes com o método #each:
+hash.each do |k, v|
+  puts "#{k} is #{v}"
+end
+
+hash.each do |k, v|
+  puts "#{k} é #{v}"
+end
+
+# Desde o Ruby 1.9, temos uma sintaxe especial quando usamos símbolos como chaves (keys)
+
+novo_hash = { defcon: 3, acao: true}
+
+novo_hash.keys #=> [:defcon, :acao]
+
+# Dica: Tanto Arrays quanto Hashes são Enumerable.
+# Eles compartilham um monte de métodos úteis como each, map, count e mais
+
+# Estruturas de controle
+
+if true
+  "Se verdadeiro"
+elsif false
+ "else if, opicional"
+else
+ "else, também é opicional"
+end
+
+for contador in 1..5
+  puts "interação #{contador}"
+end
+#=> contador 1
+#=> contador 2
+#=> contador 3
+#=> contador 4
+#=> contador 5
+
+# PORÉM
+# Ninguém usa para loops
+# Use "each" em vez, dessa forma:
+
+(1..5).each do |contador|
+  puts "interação #{contador}"
+end
+#=> contador 1
+#=> contador 2
+#=> contador 3
+#=> contador 4
+#=> contador 5
+
+contador = 1
+while contador <= 5 do
+  puts "interação #{contador}"
+  contador += 1
+end
+#=> contador 1
+#=> contador 2
+#=> contador 3
+#=> contador 4
+#=> contador 5
+
+grau = 'B'
+
+case grau
+when 'A'
+  puts "Um longo caminho a percorrer, pequeno gafanhoto"
+when 'B'
+  puts "Melhor sorte da próxima vez"
+when 'C'
+  puts "Você pode fazer melhor"
+when 'D'
+  puts "Scraping through"
+when 'F'
+  puts "Você falhou"
+else
+  puts "Alternative grading system, eh?"
+end
+
+# Funções
+
+def dobrar(x)
+  x * 2
+end
+
+# Funções (e todos os blocos) retornam implicitamente o valor da última linha
+dobrar(2) #=> 4
+
+# Parênteses são opicionais onde o resultado é claro
+dobrar 3 #=> 6
+
+dobrar dobrar 3 #=> 12
+
+def somar(x,y)
+  x + y
+end
+
+# Argumentos de métodos são separados por uma vírgula
+somar 3, 4 #=> 7
+
+somar somar(3,4), 5 #=> 12
+
+# yield
+# Todos os métodos possuem implicitamente um paramêntro opcional que é um bloco
+# ele pode ser chamado com a palavra chave 'yield'
+
+def ao_redor
+  puts "{"
+  yield
+  puts "}"
+end
+
+ao_redor { puts 'Olá mundo' }
+
+# {
+# Olá mundo
+# }
+
+
+# Define uma classe com a palavra chave 'class'
+
+class Humano
+
+  # Uma variável de classe. Ela é compartilhada por todas as instâncias dessa classe
+  @@especies = "H. sapiens"
+
+  # Inicialização básica (contructor)
+  def initialize(nome, idade=0)
+    # Atribui o argumento para a variável de instancia "nome" do objeto
+    @nome = nome
+    # Se a idade não for passada, nós definimos um valor padrão na lista de argumentos
+    @idade = idade
+  end
+
+  # Método básico para atribuir valor
+  def nome=(nome)
+    @nome = nome
+  end
+
+  # Método básico de resgatar valor
+  def nome
+    @nome
+  end
+
+  # Um método de classe usa a palavra chave self para se defenciar dos métodos de instância.
+  # Ele só pode ser chamado na classe, não na instancia
+  def self.diz(msg)
+    puts "#{msg}"
+  end
+
+  def especies
+    @@especies
+  end
+
+end
+
+
+# Instanciando uma classe
+jim = Humano.new("Jim Halpert")
+
+dwight = Humano.new("Dwight K. Schrute")
+
+# Vamos chamar um par de métodos
+jim.especies #=> "H. sapiens"
+
+jim.nome #=> "Jim Halpert"
+
+jim.nome = "Jim Halpert II" #=> "Jim Halpert II"
+
+jim.nome #=> "Jim Halpert II"
+
+dwight.especies #=> "H. sapiens"
+
+dwight.nome #=> "Dwight K. Schrute"
+
+# Chamar o método de classe
+Humano.diz("Oi") #=> "Oi"
+
+# Uma classe também é objeto em Ruby. Então uma classe pode possuir variável de instância
+# Variáveis de classe são compartilhadas entre a classe e todos os seus descendentes.
+
+
+# Classe base
+class Humano
+  @@foo = 0
+
+  def self.foo
+    @@foo
+  end
+
+  def self.foo=(value)
+    @@foo = value
+  end
+end
+
+#  classe filha
+class Trabalhador < Humano
+end
+
+Humano.foo # 0
+Trabalhador.foo # 0
+
+Humano.foo = 2 # 2
+Trabalhador.foo # 2
+
+# Uma variável de instância não é compartilhada por suas classes decendentes.
+
+class Humano
+  @bar = 0
+
+  def self.bar
+    @bar
+  end
+
+  def self.bar=(value)
+    @bar = value
+  end
+end
+
+class Doutor < Humano
+end
+
+Humano.bar # 0
+Doutor.bar # nil
+
+```
diff --git a/ru-ru/clojure-ru.html.markdown b/ru-ru/clojure-ru.html.markdown
new file mode 100644
index 00000000..e1d68e5a
--- /dev/null
+++ b/ru-ru/clojure-ru.html.markdown
@@ -0,0 +1,426 @@
+---
+language: clojure
+filename: learnclojure-ru.clj
+contributors:
+    - ["Adam Bard", "http://adambard.com/"]
+    - ["Alexey Pirogov", "http://twitter.com/alex_pir"]
+lang: ru-ru
+---
+
+Clojure, это представитель семейства Lisp-подобных языков, разработанный
+для Java Virtual Machine. Язык идейно гораздо ближе к чистому
+[функциональному программированию](https://ru.wikipedia.org/wiki/%D0%A4%D1%83%D0%BD%D0%BA%D1%86%D0%B8%D0%BE%D0%BD%D0%B0%D0%BB%D1%8C%D0%BD%D0%BE%D0%B5_%D0%BF%D1%80%D0%BE%D0%B3%D1%80%D0%B0%D0%BC%D0%BC%D0%B8%D1%80%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B5) чем его прародитель Common Lisp, но в то же время обладает набором инструментов для работы с состоянием,
+таких как [STM](https://ru.wikipedia.org/wiki/Software_transactional_memory).
+
+Благодаря такому сочетанию технологий в одном языке, разработка программ,
+предполагающих конкурентное выполнение, значительно упрощается
+и даже может быть автоматизирована.
+
+(Последующие примеры кода предполагают выполнение в Clojure версии 1.2 и выше)
+
+
+```clojure
+; Комментарии начинаются символом ";".
+
+; Код на языке Clojure записывается в виде "форм",
+; которые представляют собой обычные списки элементов, разделенных пробелами,
+; заключённые в круглые скобки
+;
+; Clojure Reader (инструмент языка, отвечающий за чтение исходного кода),
+; анализируя форму, предполагает, что первым элементом формы (т.е. списка)
+; является функция или макрос, который следует вызвать, передав ему
+; в качестве аргументов остальные элементы списка-формы.
+
+; Первым вызовом в файле должен быть вызов функции ns,
+; которая отвечает за выбор текущего пространства имен (namespace)
+(ns learnclojure-ru)
+
+; Несколько простых примеров:
+
+; str объединяет в единую строку все свои аргументы
+(str "Hello" " " "World") ; => "Hello World"
+
+; Арифметика тоже выглядит несложно
+(+ 1 1) ; => 2
+(- 2 1) ; => 1
+(* 1 2) ; => 2
+(/ 2 1) ; => 2
+
+; Проверка на равенство (Equality)
+(= 1 1) ; => true
+(= 2 1) ; => false
+
+; Для булевой логики вам может понадобиться not
+(not true) ; => false
+
+; Вложенные формы, конечно же, допустимы и работают вполне предсказуемо
+(+ 1 (- 3 2)) ; = 1 + (3 - 2) => 2
+
+; Типы
+;;;;;;;;;;;;;
+
+; Clojure использует типы Java для представления булевых значений,
+; строк и чисел
+; Узнать тип мы можем, использую функцию `class
+(class 1)     ; Целочисленные литералы типа по-умолчанию являются java.lang.Long
+(class 1.)    ; Числа с плавающей точкой, это java.lang.Double
+(class "")    ; Строки всегда заключаются в двойные кавычки
+              ; и представляют собой java.lang.String
+(class false) ; Булевы значения, это экземпляры java.lang.Boolean
+(class nil)   ; "Пустое" значение называется "nil"
+
+; Если Вы захотите создать список из чисел, вы можете просто
+; предварить форму списка символом "'", который подскажет Reader`у,
+; что эта форма не требует вычисления
+'(+ 1 2) ; => (+ 1 2)
+; ("'", это краткая запись формы (quote (+ 1 2))
+
+; "Квотированный" список можно вычислить, передав его функции eval
+(eval '(+ 1 2)) ; => 3
+
+; Коллекции и Последовательности
+;;;;;;;;;;;;;;;;;;;
+
+; Списки (Lists) в clojure структурно представляют собой "связанные списки",
+; тогда как Векторы (Vectors), устроены как массивы.
+; Векторы и Списки тоже являются классами Java!
+(class [1 2 3]); => clojure.lang.PersistentVector
+(class '(1 2 3)); => clojure.lang.PersistentList
+
+; Список может быть записан, как (1 2 3), но в этом случае
+; он будет воспринят reader`ом, как вызов функции.
+; Есть два способа этого избежать:
+; '(1 2 3)     - квотирование,
+; (list 1 2 3) - явное конструирование списка с помощью функции list.
+
+; "Коллекции", это некие наборы данных
+; И списки, и векторы являются коллекциями:
+(coll? '(1 2 3)) ; => true
+(coll? [1 2 3]) ; => true
+
+; "Последовательности" (seqs), это абстракция над наборами данных,
+; элементы которых "упакованы" последовательно.
+; Списки - последовательности, а вектора - нет.
+(seq? '(1 2 3)) ; => true
+(seq? [1 2 3]) ; => false
+
+; Любая seq предоставляет доступ только к началу последовательности данных,
+; не предоставляя информацию о её длине.
+; При этом последовательности могут быть и бесконечными,
+; т.к. являются ленивыми и предоставляют данные только по требованию!
+(range 4) ; => (0 1 2 3)
+(range) ; => (0 1 2 3 4 ...) (бесконечная последовательность!)
+(take 4 (range)) ;  (0 1 2 3)
+
+; Добавить элемент в начало списка или вектора можно с помощью функции cons
+(cons 4 [1 2 3]) ; => (4 1 2 3)
+(cons 4 '(1 2 3)) ; => (4 1 2 3)
+
+; Функция conj добавляет элемент в коллекцию
+; максимально эффективным для неё способом.
+; Для списков эффективно добавление в начло, а для векторов - в конец.
+(conj [1 2 3] 4) ; => [1 2 3 4]
+(conj '(1 2 3) 4) ; => (4 1 2 3)
+
+; Функция concat объединяет несколько списков и векторов в единый список
+(concat [1 2] '(3 4)) ; => (1 2 3 4)
+
+; Работать с коллекциями удобно с помощью функций filter и map
+(map inc [1 2 3]) ; => (2 3 4)
+(filter even? [1 2 3]) ; => (2)
+
+; reduce поможет "свернуть" коллекцию
+(reduce + [1 2 3 4])
+; = (+ (+ (+ 1 2) 3) 4)
+; => 10
+
+; Вызывая reduce, мы можем указать начальное значение
+(reduce conj [] '(3 2 1))
+; = (conj (conj (conj [] 3) 2) 1)
+; => [3 2 1]
+
+; Функции
+;;;;;;;;;;;;;;;;;;;;;
+
+; Функция создается специальной формой fn.
+; "Тело"" функции может состоять из нескольких форм,
+; но результатом вызова функции всегда будет результат вычисления
+; последней из них.
+(fn [] "Hello World") ; => fn
+
+; (Вызов функции требует "оборачивания" fn-формы в форму вызова)
+((fn [] "Hello World")) ; => "Hello World"
+
+; Назначить значению имя можно специальной формой def
+(def x 1)
+x ; => 1
+
+; Назначить имя можно любому значению, в т.ч. и функции:
+(def hello-world (fn [] "Hello World"))
+(hello-world) ; => "Hello World"
+
+; Поскольку именование функций - очень частая операция,
+; clojure позволяет, сделать это проще:
+(defn hello-world [] "Hello World")
+
+; Вектор [] в форме описания функции, следующий сразу за именем,
+; описывает параметры функции:
+(defn hello [name]
+  (str "Hello " name))
+(hello "Steve") ; => "Hello Steve"
+
+; Одна функция может иметь сразу несколько наборов аргументов:
+(defn hello3
+  ([] "Hello World")
+  ([name] (str "Hello " name)))
+(hello3 "Jake") ; => "Hello Jake"
+(hello3) ; => "Hello World"
+
+; Также функция может иметь набор аргументов переменной длины
+(defn count-args [& args] ; args будет содержать seq аргументов
+  (str "You passed " (count args) " args: " args))
+(count-args 1 2 3) ; => "You passed 3 args: (1 2 3)"
+
+; Можно комбинировать оба подхода задания аргументов
+(defn hello-count [name & args]
+  (str "Hello " name ", you passed " (count args) " extra args"))
+(hello-count "Finn" 1 2 3)
+; => "Hello Finn, you passed 3 extra args"
+
+; Для создания анонимных функций есть специальный синтаксис:
+; функциональные литералы
+(def hello2 #(str "Hello " %1))
+(hello2 "Fanny") ; => "Hello Fanny"
+
+; такие функциональные литералы удобно использовать с map, filter и reduce
+(map #(* 10 %1) [1 2 3 5])          ; => (10 20 30 50)
+(filter #(> %1 3) [1 2 3 4 5 6 7])  ; => (4 5 6 7)
+(reduce #(str %1 "," %2) [1 2 3 4]) ; => "1,2,3,4"
+
+; Отображения (Maps)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; Hash maps и array maps имеют одинаковый интерфейс.
+; Hash maps производят поиск по ключу быстрее, но не сохраняют порядок ключей
+(class {:a 1 :b 2 :c 3})          ; => clojure.lang.PersistentArrayMap
+(class (hash-map :a 1 :b 2 :c 3)) ; => clojure.lang.PersistentHashMap
+
+; Array maps автоматически преобразуются в hash maps,
+; как только разрастутся до определенного размера
+
+; Отображения могут использовать в качестве ключей любые хэшируемые значения,
+; однако предпочтительными являются ключи,
+; являющиеся "ключевыми словами" (keywords)
+(class :a) ; => clojure.lang.Keyword
+
+(def stringmap {"a" 1, "b" 2, "c" 3})
+stringmap  ; => {"a" 1, "b" 2, "c" 3}
+
+(def keymap {:a 1, :b 2, :c 3})
+keymap ; => {:a 1, :c 3, :b 2}
+
+; Предыдущий пример содержит запятые в коде, однако reader не использует их,
+; при обработке литералов - запятые просто воспринимаются,
+; как "пробельные символы" (whitespaces)
+
+; Отображение может выступать в роли функции, возвращающей значение по ключу
+(stringmap "a")          ; => 1
+(keymap :a)              ; => 1
+
+; При попытке получить отсутствующее значение, будет возвращён nil
+(stringmap "d") ; => nil
+
+; Иногда бывает удобно указать конкретное значение по-умолчанию:
+({:a 1 :b 2} :c "Oops!") ; => "Oops!"
+
+; Keywords тоже могут использоваться в роли функций!
+(:b keymap) ; => 2
+
+; Однако этот фокус не пройдёт со строками.
+;("a" stringmap)
+; => Exception: java.lang.String cannot be cast to clojure.lang.IFn
+
+; Добавить пару ключ-значение в отображение можно функцией assoc
+(def newkeymap (assoc keymap :d 4))
+newkeymap ; => {:a 1, :b 2, :c 3, :d 4}
+
+; Но всегда следует помнить, что значения в Clojure - неизменяемые!
+keymap ; => {:a 1, :b 2, :c 3} - оригинал не был затронут
+
+; dissoc позволяет исключить значение по ключу
+(dissoc keymap :a :b) ; => {:c 3}
+
+; Множества (Sets)
+;;;;;;;;;;;;;;;;;;
+
+(class #{1 2 3}) ; => clojure.lang.PersistentHashSet
+(set [1 2 3 1 2 3 3 2 1 3 2 1]) ; => #{1 2 3}
+
+; Добавляются элементы посредством conj
+(conj #{1 2 3} 4) ; => #{1 2 3 4}
+
+; Исключаются - посредством disj
+(disj #{1 2 3} 1) ; => #{2 3}
+
+; Вызов множества, как функции, позволяет проверить
+; принадлежность элемента этому множеству:
+(#{1 2 3} 1) ; => 1
+(#{1 2 3} 4) ; => nil
+
+; В пространстве имен clojure.sets
+; содержится множество функций для работы с множествами
+
+; Полезные формы
+;;;;;;;;;;;;;;;;;
+
+; Конструкции ветвления в clojure, это обычные макросы
+; и подобны их собратьям в других языках:
+(if false "a" "b") ; => "b"
+(if false "a") ; => nil
+
+; Специальная форма let позволяет присвоить имена значениям локально.
+; При этом все изменения будут видны только вложенным формам:
+(def a 10)
+(let [a 1 b 2]
+  (> a b)) ; => false
+
+; Несколько форм можно объединить в одну форму посредством do
+; Значением do-формы будет значение последней формы из списка вложенных в неё:
+(do
+  (print "Hello")
+  "World") ; => "World" (prints "Hello")
+
+; Множество макросов содержит внутри себя неявную do-форму.
+; Пример - макрос определения функции:
+(defn print-and-say-hello [name]
+  (print "Saying hello to " name)
+  (str "Hello " name))
+(print-and-say-hello "Jeff") ;=> "Hello Jeff" (prints "Saying hello to Jeff")
+
+; Ещё один пример - let:
+(let [name "Urkel"]
+  (print "Saying hello to " name)
+  (str "Hello " name)) ; => "Hello Urkel" (prints "Saying hello to Urkel")
+
+; Модули
+;;;;;;;;;
+
+; Форма "use" позволяет добавить в текущее пространство имен
+; все имена (вместе со значениями) из указанного модуля:
+(use 'clojure.set)
+
+; Теперь нам доступны операции над множествами:
+(intersection #{1 2 3} #{2 3 4}) ; => #{2 3}
+(difference #{1 2 3} #{2 3 4}) ; => #{1}
+
+; use позволяет указать, какие конкретно имена
+; должны быть импортированы из модуля:
+(use '[clojure.set :only [intersection]])
+
+; Также модуль может быть импортирован формой require
+(require 'clojure.string)
+
+; После этого модуль становится доступе в текущем пространстве имен,
+; а вызов его функций может быть осуществлен указанием полного имени функции:
+(clojure.string/blank? "") ; => true
+
+; Импортируемому модулю можно назначить короткое имя:
+(require '[clojure.string :as str])
+(str/replace "This is a test." #"[a-o]" str/upper-case) ; => "THIs Is A tEst."
+; (Литерал вида #"" обозначает регулярное выражение)
+
+; Вместо отдельной формы require (и use, хотя это и не приветствуется) можно
+; указать необходимые модули прямо в форме ns:
+(ns test
+  (:require
+    [clojure.string :as str] ; Внимание: при указании внутри формы ns
+    [clojure.set :as set]))  ; имена пакетов не квотируются!
+
+; Java
+;;;;;;;
+
+; Стандартная библиотека Java очень богата,
+; и всё это богатство доступно и для Clojure!
+
+; import позволяет импортировать модули Java
+(import java.util.Date)
+
+; В том числе и из ns
+(ns test
+  (:import java.util.Date
+           java.util.Calendar))
+
+; Имя класса, сопровождаемое символом "." позволяет
+; инстанцировать объекты Java-классов:
+(Date.) ; <a date object>
+
+; форма . позволяет вызывать методы:
+(. (Date.) getTime) ; <a timestamp>
+(.getTime (Date.))  ; а можно и так
+
+; Статические методы вызываются как функции модуля:
+(System/currentTimeMillis) ; <a timestamp> (Модуль system всегда доступен!)
+
+; doto позволяет удобно работать с объектами, изменяющими свое состояние
+(import java.util.Calendar)
+(doto (Calendar/getInstance)
+  (.set 2000 1 1 0 0 0)
+  .getTime) ; => A Date. set to 2000-01-01 00:00:00
+
+; Работа с изменяемым сотоянием
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; Clojure предоставляет набор инструментов
+; для работы с изменяемым состоянием: Software Transactional Memory.
+; Структуры STM представлены тремя типами:
+; - атомы (atoms)
+; - агенты (agents)
+; - ссылки (references)
+
+; Самые простые хранители состояния - атомы:
+(def my-atom (atom {})) ; {} - начальное состояние атома
+
+; Обновляется атом посредством swap!.
+; swap! применяет функцию аргумент к текущему значению
+; атома и помещает в атом результат
+(swap! my-atom assoc :a 1) ; Обновляет my-atom, помещая в него (assoc {} :a 1)
+(swap! my-atom assoc :b 2) ; Обновляет my-atom, помещая в него (assoc {:a 1} :b 2)
+
+; Получить значение атома можно посредством '@'
+; (провести так называемую операцию dereference)
+my-atom  ;=> Atom<#...> (Возвращает объект типа Atom)
+@my-atom ; => {:a 1 :b 2}
+
+; Пример реализации счётчика на атоме
+(def counter (atom 0))
+(defn inc-counter []
+  (swap! counter inc))
+
+(inc-counter)
+(inc-counter)
+(inc-counter)
+(inc-counter)
+(inc-counter)
+
+@counter ; => 5
+
+; С другими STM-конструкциями - refs и agents - можно ознакомиться тут:
+; Refs: http://clojure.org/refs
+; Agents: http://clojure.org/agents
+```
+
+### Для будущего чтения
+
+Это руководство не претендует на полноту, но мы смеем надеяться, способно вызвать интерес к дальнейшему изучению языка.
+
+Clojure.org - сайт содержит большое количество статей по языку:
+[http://clojure.org/](http://clojure.org/)
+
+Clojuredocs.org - сайт документации языка с примерами использования функций:
+[http://clojuredocs.org/quickref/Clojure%20Core](http://clojuredocs.org/quickref/Clojure%20Core)
+
+4Clojure - отличный способ закрепить навыки программирования на clojure, решая задачи вместе с коллегами со всего мира:
+[http://www.4clojure.com/](http://www.4clojure.com/)
+
+Clojure-doc.org (да, именно) неплохой перечень статей для начинающих:
+[http://clojure-doc.org/](http://clojure-doc.org/)
diff --git a/ru-ru/php-ru.html.markdown b/ru-ru/php-ru.html.markdown
new file mode 100644
index 00000000..9133ecca
--- /dev/null
+++ b/ru-ru/php-ru.html.markdown
@@ -0,0 +1,662 @@
+---
+language: php
+contributors:
+    - ["Malcolm Fell", "http://emarref.net/"]
+    - ["Trismegiste", "https://github.com/Trismegiste"]
+    - ["SlaF", "https://github.com/SlaF"]
+lang: ru-ru
+filename: learnphp-ru.php
+---
+
+Этот документ описывает версию PHP 5 и выше.
+
+```php
+<?php // PHP код должен быть заключен в теги <?php
+
+// Если ваш файл содержит только PHP код, то можно
+// пропустить закрывающийся ?>
+
+// А так начинаются комментарии
+
+# Это тоже комментарий но // предпочтительнее
+
+/*
+	Окруженный /* и */ текст превращается
+	в многострочный комментарий
+*/
+
+// Используйте "echo" или "print" для вывода.
+print('Hello '); // Напечатать "Hello " без перевода строки
+
+// () необязательно применять для print и echo
+echo "World\n"; // Печатать "World" и перейти на новую строку.
+// (все утверждения должны заканчиваться ;)
+
+// Любые символы за пределами закрывающегося тега выводятся автоматически:
+?>
+Hello World Again!
+<?php
+
+
+/************************************
+ * Типы и Переменные
+ */
+
+// Переменные начинаются с символа $.
+// Правильное имя переменной начинается с буквы или знака подчеркивания,
+// и может содержать любые цифры, буквы, или знаки подчеркивания.
+// Не рекомендуется использовать кирилические символы в именах (прим. пер.)
+
+// Логические значения нечувствительны к регистру
+$boolean = true;  // или TRUE или True
+$boolean = false; // или FALSE или False
+
+// Целые числа
+$int1 = 12;   // => 12
+$int2 = -12;  // => -12-
+$int3 = 012;  // => 10 (ведущий 0 обозначает восьмеричное число)
+$int4 = 0x0F; // => 15 (ведущие символы 0x означает шестнадцатеричное число)
+
+// Дробные числа
+$float = 1.234;
+$float = 1.2e3;
+$float = 7E-10;
+
+// Арифметика
+$sum        = 1 + 1; // 2
+$difference = 2 - 1; // 1
+$product    = 2 * 2; // 4
+$quotient   = 2 / 1; // 2
+
+// Арифметические сокращения
+$number = 0;
+$number += 1;      // Увеличивает $number на 1
+echo $number++;    // Печатает 1 (инкрементируется после вывода)
+echo ++$number;    // Печатает 3 (инкрементируется до вывода)
+$number /= $float; // Делится и результат присваивается $number
+
+// Строки должны быть заключены в одинарные кавычки;
+$sgl_quotes = '$String'; // => '$String'
+
+// Избегайте двойных кавычек за исключением случаев интерполирования переменной
+$dbl_quotes = "This is a $sgl_quotes."; // => 'This is a $String.'
+
+// Специальные (escape) символы работают только в двойных кавычках
+$escaped   = "This contains a \t tab character.";
+$unescaped = 'This just contains a slash and a t: \t';
+
+// Заключайте переменные в фигурные скобки если это необходимо
+$money = "I have $${number} in the bank.";
+
+// Начиная с PHP 5.3, синтаксис nowdocs может использоваться для
+// неинтерполированного многострочного текста
+$nowdoc = <<<'END'
+Multi line
+string
+END;
+
+// Heredocs поддерживает интерполяцию переменных
+$heredoc = <<<END
+Multi line
+$sgl_quotes
+END;
+
+// Строки соединяются при помощи .
+echo 'This string ' . 'is concatenated';
+
+
+/********************************
+ * Константы
+ */
+ 
+// Константа определяется при помощи define()
+// и никогда не может быть изменена во время выполнения программы!
+
+// Правильное имя константы начинается с буквы или символа подчеркивания,
+// и содержит любое колличество букв, цифр и знаков подчеркивания.
+define("FOO", "something");
+
+// Доступ к константе возможен через прямое указание её имени
+echo 'This outputs '.FOO;
+
+/********************************
+ * Массивы
+ */
+
+// Все массивы в PHP - это ассоциативные массивы или хеши,
+
+// Ассоциативные массивы, известные в других языках как хеш-карты.
+
+// Работает во всех версиях РHP
+$associative = array('One' => 1, 'Two' => 2, 'Three' => 3);
+
+// В PHP 5.4 появился новый синтаксис
+$associative = ['One' => 1, 'Two' => 2, 'Three' => 3];
+
+echo $associative['One']; // печатает 1
+
+// Список тоже содержит целочисленные ключи
+$array = ['One', 'Two', 'Three'];
+echo $array[0]; // => "One"
+
+
+/********************************
+ * Вывод
+ */
+
+echo('Hello World!');
+// Печатает Hello World! на stdout.
+// Stdout это веб-страница запущенная в браузере.
+
+print('Hello World!'); // Аналогично echo
+
+// echo - это конструкция языка, вы можете опустить скобки.
+echo 'Hello World!';
+print 'Hello World!'; // Выводит Hello World!
+
+$paragraph = 'paragraph';
+
+echo 100;        // Печать скалярной переменной напрямую
+echo $paragraph; // или печать переменной
+
+// Если короткие теги разрешены, или ваша версия PHP >= 5.4
+// вы можете использовать сокращенный синтаксис echo
+?>
+<p><?= $paragraph ?></p>
+<?php
+
+$x = 1;
+$y = 2;
+$x = $y; // $x теперь содержит значение переменной $y
+$z = &$y;
+// $z содержит ссылку на $y. Изменение значения $z затронет значение $y и наоборот.
+// Значение $x остается неизменным. 
+
+echo $x; // => 2
+echo $z; // => 2
+$y = 0;
+echo $x; // => 2
+echo $z; // => 0
+
+
+/********************************
+ * Логические выражения
+ */
+$a = 0;
+$b = '0';
+$c = '1';
+$d = '1';
+
+// Утверждение (assert) выдает предупреждение если аргумент не true
+
+// Эти сравнения всегда будут истинными, даже если типы будут различаться
+assert($a == $b); // "равно"
+assert($c != $a); // "не равно"
+assert($c <> $a); // другое обозначение "не равно"
+assert($a < $c); // меньше
+assert($c > $b); // больше
+assert($a <= $b); // меньше или равно
+assert($c >= $d); // больше или равно
+
+// Следующие утверждения истинны если переменные имеют одинаковый тип.
+assert($c === $d);
+assert($a !== $d);
+assert(1 == '1');
+assert(1 !== '1');
+
+// Переменные могут изменять тип, в зависимости от их использования.
+$integer = 1;
+echo $integer + $integer; // => 2
+
+$string = '1';
+echo $string + $string; // => 2 (строка превращается в число)
+
+// Выводится 0 по той причине, что оператор + не может привести строку 'one' к
+// числовому типу
+$string = 'one';
+echo $string + $string; // => 0
+
+// Приведение типов (type casting) может быть использовано для преобразование
+// переменной в другой тип
+$boolean = (boolean) 1; // => true
+
+$zero = 0;
+$boolean = (boolean) $zero; // => false
+
+// Также существуют функции выполняющие приведение типов
+$integer = 5;
+$string = strval($integer);
+$float = floatval($integer);
+
+$var = null; // Null
+
+// И похожая по действию функция
+$integer = 10;
+$boolen = settype($integer, "string") // теперь $integer имеет строковый тип
+
+// settype возвращает true - если преобразование удалось и false в противном случае
+
+/********************************
+ * Управляющие структуры
+ */
+
+if (true) {
+    print 'I get printed';
+}
+
+if (false) {
+    print 'I don\'t';
+} else {
+    print 'I get printed';
+}
+
+if (false) {
+    print 'Does not get printed';
+} elseif(true) {
+    print 'Does';
+}
+
+// Тернарный оператор
+print (false ? 'Does not get printed' : 'Does');
+
+$x = 0;
+if ($x === '0') {
+    print 'Does not print';
+} elseif($x == '1') {
+    print 'Does not print';
+} else {
+    print 'Does print';
+}
+
+// Альтернативный синтаксис полезный для шаблонов
+?>
+
+<?php if ($x): ?>
+This is displayed if the test is truthy.
+<?php else: ?>
+This is displayed otherwise.
+<?php endif; ?>
+
+<?php
+
+// Использование switch.
+switch ($x) {
+    case '0':
+        print 'Switch does type coercion';
+        break; // You must include a break, or you will fall through
+               // to cases 'two' and 'three'
+    case 'two':
+    case 'three':
+        // Do something if $variable is either 'two' or 'three'
+        break;
+    default:
+        // Do something by default
+}
+
+// Циклы: while, do...while и for
+$i = 0;
+while ($i < 5) {
+    echo $i++;
+}; // Prints "01234"
+
+echo "\n";
+
+$i = 0;
+do {
+    echo $i++;
+} while ($i < 5); // Prints "01234"
+
+echo "\n";
+
+for ($x = 0; $x < 10; $x++) {
+    echo $x;
+} // Prints "0123456789"
+
+echo "\n";
+
+$wheels = ['bicycle' => 2, 'car' => 4];
+
+// Циклы foreach могут обходить массивы
+foreach ($wheels as $wheel_count) {
+    echo $wheel_count;
+} // Prints "24"
+
+echo "\n";
+
+// Вы можете обходить как ключи, так и их значения
+foreach ($wheels as $vehicle => $wheel_count) {
+    echo "A $vehicle has $wheel_count wheels";
+}
+
+echo "\n";
+
+$i = 0;
+while ($i < 5) {
+    if ($i === 3) {
+        break; // Exit out of the while loop
+    }
+    echo $i++;
+} // Prints "012"
+
+for ($i = 0; $i < 5; $i++) {
+    if ($i === 3) {
+        continue; // Skip this iteration of the loop
+    }
+    echo $i;
+} // Prints "0124"
+
+
+/********************************
+ * Функции
+ */
+
+// Определение функции:
+function my_function () {
+  return 'Hello';
+}
+
+echo my_function(); // => "Hello"
+
+// Правильное имя функции начинается с буквы или символа подчеркивания
+// и состоит из букв, цифр или знаков подчеркивания.
+
+function add ($x, $y = 1) { // $y по умолчанию равно 1
+  $result = $x + $y;
+  return $result;
+}
+
+echo add(4); // => 5
+echo add(4, 2); // => 6
+
+// $result недоступна за пределами функции
+// print $result; // Выдает предупреждение
+
+// Начиная с PHP 5.3 вы можете объявлять анонимные функции:
+$inc = function ($x) {
+  return $x + 1;
+};
+
+echo $inc(2); // => 3
+
+function foo ($x, $y, $z) {
+  echo "$x - $y - $z";
+}
+
+// Функции могут возвращать функции
+function bar ($x, $y) {
+  // Используйте 'use' для передачи внешних переменных
+  return function ($z) use ($x, $y) {
+    foo($x, $y, $z);
+  };
+}
+
+$bar = bar('A', 'B');
+$bar('C'); // Prints "A - B - C"
+
+// Вы можете вызывать именованные функции используя строки
+$function_name = 'add';
+echo $function_name(1, 2); // => 3
+// Полезно для программного определения запущенной функции.
+// Или используйте call_user_func(callable $callback [, $parameter [, ... ]]);
+
+
+/********************************
+ * Includes
+ */
+
+<?php
+// PHP код внутри включаемого файла должен начинаться с тега PHP.
+
+include 'my-file.php';
+// Код в файле my-file.php теперь доступен в текущем в текущем пространстве имен.
+// Если файл не удалось включить, будет выдано предупреждение.
+
+include_once 'my-file.php';
+// Если код в файле my-file.php уже был включен, он не будет включен повторно.
+// Это предотвращает ошибку повторного включения файла.
+
+require 'my-file.php';
+require_once 'my-file.php';
+
+// Same as include(), except require() will cause a fatal error if the
+// file cannot be included.
+// Действует также как и include(), но если файл не удалось подключить,
+// функция выдает неисправимую ошибку
+
+// Содержимое файла my-include.php:
+<?php
+
+return 'Anything you like.';
+// Конец файла
+
+// Эти функции могут также возвращать значения.
+$value = include 'my-include.php';
+
+// Имена файлов содержат их путь в файловой системе, или если передано просто
+// имя файла, PHP обращается к директиве include_path. Если файл не найден в
+// include_path, предпринимается попытка поиска в папке, где выполняется скрипт
+// или в текущей рабочей директории. Если не в одном из этих мест файл не
+// найден - выдается ошибка
+/* */
+
+/********************************
+ * Классы
+ */
+
+// Классы определяются при помощи ключевого слова "class"
+
+class MyClass
+{
+    const MY_CONST      = 'value'; // A constant
+
+    static $staticVar   = 'static';
+
+    // Properties must declare their visibility
+    public $property    = 'public';
+    public $instanceProp;
+    protected $prot = 'protected'; // Accessible from the class and subclasses
+    private $priv   = 'private';   // Accessible within the class only
+
+    // Create a constructor with __construct
+    public function __construct($instanceProp) {
+        // Access instance variables with $this
+        $this->instanceProp = $instanceProp;
+    }
+
+    // Methods are declared as functions inside a class
+    public function myMethod()
+    {
+        print 'MyClass';
+    }
+
+    final function youCannotOverrideMe()
+    {
+    }
+
+    public static function myStaticMethod()
+    {
+        print 'I am static';
+    }
+}
+
+echo MyClass::MY_CONST;    // Выведет 'value';
+echo MyClass::$staticVar;  // Выведет 'static';
+MyClass::myStaticMethod(); // Выведет 'I am static';
+
+// Новый экземпляр класса используя new
+$my_class = new MyClass('An instance property');
+
+// Если аргументы отсутствуют, можно не ставить круглые скобки
+
+// Доступ к членам класса используя ->
+echo $my_class->property;     // => "public"
+echo $my_class->instanceProp; // => "An instance property"
+$my_class->myMethod();        // => "MyClass"
+
+// Наследование классов используя "extends"
+class MyOtherClass extends MyClass
+{
+    function printProtectedProperty()
+    {
+        echo $this->prot;
+    }
+
+    // Override a method
+    function myMethod()
+    {
+        parent::myMethod();
+        print ' > MyOtherClass';
+    }
+}
+
+$my_other_class = new MyOtherClass('Instance prop');
+$my_other_class->printProtectedProperty(); // => Выведет "protected"
+$my_other_class->myMethod();               // Выведет "MyClass > MyOtherClass"
+
+final class YouCannotExtendMe
+{
+}
+
+// Вы можете использовать "магические методы" для создания геттеров и сеттеров
+class MyMapClass
+{
+    private $property;
+
+    public function __get($key)
+    {
+        return $this->$key;
+    }
+
+    public function __set($key, $value)
+    {
+        $this->$key = $value;
+    }
+}
+
+$x = new MyMapClass();
+echo $x->property; // Будет использован метод __get()
+$x->property = 'Something'; // Будет использован метод __set()
+
+// Классы могут быть абстрактными (используя ключевое слово abstract)
+// или реализовывать интерфейсы (используя ключевое слово implements).
+// Интерфейсы определяются при помощи ключевого слова interface
+
+interface InterfaceOne
+{
+    public function doSomething();
+}
+
+interface InterfaceTwo
+{
+    public function doSomethingElse();
+}
+
+// Интерфейсы могут быть расширены
+interface InterfaceThree extends InterfaceTwo
+{
+    public function doAnotherContract();
+}
+
+abstract class MyAbstractClass implements InterfaceOne
+{
+    public $x = 'doSomething';
+}
+
+class MyConcreteClass extends MyAbstractClass implements InterfaceTwo
+{
+    public function doSomething()
+    {
+        echo $x;
+    }
+
+    public function doSomethingElse()
+    {
+        echo 'doSomethingElse';
+    }
+}
+
+// Классы могут реализовывать более одного интерфейса
+class SomeOtherClass implements InterfaceOne, InterfaceTwo
+{
+    public function doSomething()
+    {
+        echo 'doSomething';
+    }
+
+    public function doSomethingElse()
+    {
+        echo 'doSomethingElse';
+    }
+}
+
+
+/********************************
+ * Трейты
+ */
+
+// Трейты появились в PHP 5.4.0 и объявляются при помощи ключевого слова trait
+
+trait MyTrait
+{
+    public function myTraitMethod()
+    {
+        print 'I have MyTrait';
+    }
+}
+
+class MyTraitfulClass
+{
+    use MyTrait;
+}
+
+$cls = new MyTraitfulClass();
+$cls->myTraitMethod(); // Prints "I have MyTrait"
+
+
+/********************************
+ * Пространства имен
+ */
+
+// Это секция особая, ведь объявление пространства имен
+// должно быть самым первым в файле. Позвольте сделать вид, что это не так
+
+<?php
+
+// По умолчанию, классы существуют в глобальном пространстве имен и могут быть
+// вызваны с обратным слешем.
+
+$cls = new \MyClass();
+
+// Задание пространства имен файла
+namespace My\Namespace;
+
+class MyClass
+{
+}
+
+// (из другого файла)
+$cls = new My\Namespace\MyClass;
+
+// Или внутри другого пространства имен.
+namespace My\Other\Namespace;
+
+use My\Namespace\MyClass;
+
+$cls = new MyClass();
+
+// Или вы можете создать псевдоним для пространства имен:
+namespace My\Other\Namespace;
+
+use My\Namespace as SomeOtherNamespace;
+
+$cls = new SomeOtherNamespace\MyClass();
+
+*/
+
+```
+
+## Смотрите также:
+Посетите страницу [официальной документации PHP](http://www.php.net/manual/) для справки. 
+Если вас интересуют полезные приемы использования PHP посетите [PHP The Right Way](http://www.phptherightway.com/).
+Если вы раньше пользовались языком с хорошей организацией пакетов, посмотрите [Composer](http://getcomposer.org/).
+Для изучения стандартов использования языка посетите PHP Framework Interoperability Group's [PSR standards](https://github.com/php-fig/fig-standards). 
diff --git a/ru-ru/python-ru.html.markdown b/ru-ru/python-ru.html.markdown
new file mode 100644
index 00000000..9163c8aa
--- /dev/null
+++ b/ru-ru/python-ru.html.markdown
@@ -0,0 +1,490 @@
+---
+language: python
+lang: ru-ru
+contributors:
+    - ["Yury Timofeev", "http://twitter.com/gagar1n"]
+filename: learnpython-ru.py
+---
+
+Язык Python был создан Гвидо ван Россумом в ранние 90-е. Сегодня это один из самых популярных 
+языков. Я влюбился в него благодаря его понятному и доходчивому синтаксису - это почти что исполняемый псевдокод.
+
+Обратная связь будет высоко оценена! Вы можете связаться со мной: [@louiedinh](http://twitter.com/louiedinh) или louiedinh [at] [google's email service]
+
+Замечание: Эта статья относится к Python 2.7, но должна быть применима к Python 2.x. Скоро ожидается версия и для Python 3!
+
+```python
+# Однострочные комментарии начинаются с hash-символа.
+""" Многострочный текст может быть 
+    записан, используя 3 знака " и обычно используется
+    в качестве комментария
+"""
+
+####################################################
+## 1. Примитивные типы данных и операторв
+####################################################
+
+# У вас есть числа
+3 #=> 3
+
+# Математика работает так, как вы и думаете
+1 + 1 #=> 2
+8 - 1 #=> 7
+10 * 2 #=> 20
+35 / 5 #=> 7
+
+# Деление немного сложнее. Это деление целых чисел и результат 
+# автоматически округляется в меньшую сторону.
+5 / 2 #=> 2
+
+# Чтобы научиться делить, сначала нужно немного узнать о дробных числах.
+2.0     # Это дробное число.
+11.0 / 4.0 #=> 2.75 вооот... гораздо лучше
+
+# Приоритет операций указывается скобками
+(1 + 3) * 2 #=> 8
+
+# Логические значения являются примитивами
+True
+False
+
+# Для отрицания используется ключевое слово not
+not True #=> False
+not False #=> True
+
+# Равенство это ==
+1 == 1 #=> True
+2 == 1 #=> False
+
+# Неравенство это !=
+1 != 1 #=> False
+2 != 1 #=> True
+
+# Больше сравнений
+1 < 10 #=> True
+1 > 10 #=> False
+2 <= 2 #=> True
+2 >= 2 #=> True
+
+# Сравнения могут быть соединены в цепь!
+1 < 2 < 3 #=> True
+2 < 3 < 2 #=> False
+
+# Строки создаются при символом " или '
+"Это строка."
+'Это тоже строка.'
+
+# Строки тоже могут складываться!
+"Привет " + "мир!" #=> "Привет мир!"
+
+# Со строкой можно работать как со списком символов
+"Это строка"[0] #=> 'Э'
+
+# % используется для форматирования строк, например:
+"%s могут быть %s" % ("строки", "интерполированы")
+
+# Новый метод форматирования строк - использование метода format.
+# Это предпочитаемый способ.
+"{0} могут быть {1}".format("строки", "форматированы")
+# Вы можете использовать ключевые слова, если не хотите считать.
+"{name} хочет есть {food}".format(name="Боб", food="лазанью")
+
+# None является объектом
+None #=> None
+
+# Не используйте оператор равенства `==` для сравнения 
+# объектов с None. Используйте для этого `is`
+"etc" is None #=> False
+None is None  #=> True
+
+# Оператор 'is' проверяет идентичность объектов. Он не 
+# очень полезен при работе с примитивными типами, но 
+# очень полезен при работе с объектами.
+
+# None, 0, и пустые строки/списки равны False.
+# Все остальные значения равны True
+0 == False  #=> True
+"" == False #=> True
+
+
+####################################################
+## 2. Переменные и коллекции
+####################################################
+
+# Печать довольно проста
+print "Я Python. Приятно познакомиться!"
+
+
+# Необязательно объявлять переменные перед присваиванием им значения.
+some_var = 5    # По соглашению используется нижний_регистр_с_подчеркиваниями
+some_var #=> 5
+
+# При попытке доступа к переменной, которой не было ранее присвоено значение,
+# выбрасывается исключение.
+# См. раздел "Поток управления" для информации об исключениях.
+some_other_var  # Выбрасывает ошибку именования
+
+# if может быть использован как выражение
+"yahoo!" if 3 > 2 else 2 #=> "yahoo!"
+
+# Списки хранят последовательности
+li = []
+# Можно сразу начать с заполненным списком
+other_li = [4, 5, 6]
+
+# Объекты добавляются в конец списка методом append
+li.append(1)    #li содержит [1]
+li.append(2)    #li содержит [1, 2]
+li.append(4)    #li содержит [1, 2, 4]
+li.append(3)    #li содержит [1, 2, 4, 3]
+# Удаляются с конца методом pop
+li.pop()        #=> 3 и li содержит [1, 2, 4]
+# Положим его обратно
+li.append(3)    # li содержит [1, 2, 4, 3] опять.
+
+# Обращайтесь со списком, как с обычным массивом
+li[0] #=> 1
+# Посмотрим на последний элемент
+li[-1] #=> 3
+
+# Попытка выйти за границы массива приводит к IndexError
+li[4] # Выдает IndexError
+
+# Можно обращаться к диапазону, используя "кусочный синтаксис" (slice syntax)
+# (Для тех из вас, кто любит математику, это замкнуто/открытый интервал.)
+li[1:3] #=> [2, 4]
+# Опускаем начало
+li[2:] #=> [4, 3]
+# Опускаем конец
+li[:3] #=> [1, 2, 4]
+
+# Удаляем произвольные элементы из списка оператором del
+del li[2] # li содержит [1, 2, 3]
+
+# Вы можете складывать списки
+li + other_li #=> [1, 2, 3, 4, 5, 6] - ЗАмечание: li и other_li остаются нетронутыми
+
+# Конкатенировать списки можно методом extend
+li.extend(other_li) # Теперь li содержит [1, 2, 3, 4, 5, 6]
+
+# Проверять элемент на вхождение на список оператором in
+1 in li #=> True
+
+# Длина списка вычисляется при помощи len
+len(li) #=> 6
+
+
+# Кортежи - это как списки, только неизменяемые
+tup = (1, 2, 3)
+tup[0] #=> 1
+tup[0] = 3  # Выдает TypeError
+
+# Все те же штуки можно делать и с кортежами
+len(tup) #=> 3
+tup + (4, 5, 6) #=> (1, 2, 3, 4, 5, 6)
+tup[:2] #=> (1, 2)
+2 in tup #=> True
+
+# Вы можете распаковывать кортежи (или списки) в переменные
+a, b, c = (1, 2, 3)     # a теперь равно 1, b равно 2 и c равно 3
+# Кортежи создаются по умолчанию, если опущены скобки
+d, e, f = 4, 5, 6
+# Обратите внимание, как легко поменять местами значения двух переменных
+e, d = d, e     # d теперь равно 5 and e равно 4
+
+
+#  Словари содержат ассоциативные массивы
+empty_dict = {}
+# Вот так описывается предзаполненный словарь
+filled_dict = {"one": 1, "two": 2, "three": 3}
+
+# Значения ищутся по ключу с помощью оператора []
+filled_dict["one"] #=> 1
+
+# Можно получить все ключи в виде списка
+filled_dict.keys() #=> ["three", "two", "one"]
+# Замечание - сохранение порядка ключей в словаре не гарантируется
+# Ваши результаты могут не совпадать с этими.
+
+# Можно получить и все значения в виде списка
+filled_dict.values() #=> [3, 2, 1]
+# Замечание - то же самое, что и выше, насчет порядка ключей
+
+# При помощи оператора in можно проверять ключи на вхождение в словарь
+"one" in filled_dict #=> True
+1 in filled_dict #=> False
+
+# Попытка получить значение по несуществующему ключу выбросит KeyError
+filled_dict["four"] # KeyError
+
+# Чтобы избежать этого, используйте метод get
+filled_dict.get("one") #=> 1
+filled_dict.get("four") #=> None
+# Метод get также принимает аргумент default, значение которого будет
+# возвращено при отсутствии указанного ключа
+filled_dict.get("one", 4) #=> 1
+filled_dict.get("four", 4) #=> 4
+
+# Метод setdefault - это безопасный способ добавить новую пару ключ-значение в словарь
+filled_dict.setdefault("five", 5) #filled_dict["five"] возвращает 5
+filled_dict.setdefault("five", 6) #filled_dict["five"] по прежнему возвращает 5
+
+
+# Множества содержат... ну, в общем, множества
+empty_set = set()
+# Инициализация множества набором значений
+some_set = set([1,2,2,3,4]) # some_set теперь равно set([1, 2, 3, 4])
+
+# Начиная с Python 2.7, вы можете использовать {} чтобы обьявить множество
+filled_set = {1, 2, 2, 3, 4} # => {1 2 3 4}
+
+# Добавление новых элементов в множество
+filled_set.add(5) # filled_set равно {1, 2, 3, 4, 5}
+
+# Пересечение множеств: &
+other_set = {3, 4, 5, 6}
+filled_set & other_set #=> {3, 4, 5}
+
+# Объединение множеств: |
+filled_set | other_set #=> {1, 2, 3, 4, 5, 6}
+
+# Разность множеств: -
+{1,2,3,4} - {2,3,5} #=> {1, 4}
+
+# Проверка на вхождение во множество: in
+2 in filled_set #=> True
+10 in filled_set #=> False
+
+
+####################################################
+## 3. Поток управления
+####################################################
+
+# Давайте заведем переменную
+some_var = 5
+
+# Так выглядит выражение if. Отступы в python очень важны!
+# результат: "some_var меньше, чем 10"
+if some_var > 10:
+    print "some_var намного больше, чем 10."
+elif some_var < 10:    # Выражение elif необязательно.
+    print "some_var меньше, чем 10."
+else:           # Это тоже необязательно.
+    print "some_var равно 10."
+
+
+"""
+Циклы For проходят по циклам
+результат:
+    собака это млекопитающее
+    кошка это млекопитающее
+    мышь это млекопитающее
+"""
+for animal in ["собака", "кошка", "мышь"]:
+    # Можете использовать оператор % для интерполяции форматированных строк
+    print "%s это млекопитающее" % animal
+    
+"""
+`range(number)` возвращает список чисел
+от нуля до заданного числа
+результат:
+    0
+    1
+    2
+    3
+"""
+for i in range(4):
+    print i
+
+"""
+Циклы while продолжаются до тех пор, пока указанное условие не станет ложным.
+результат:
+    0
+    1
+    2
+    3
+"""
+x = 0
+while x < 4:
+    print x
+    x += 1  # То же самое, что x = x + 1
+
+# Обрабывайте исключения блоками try/except
+
+# Работает в Python 2.6 и выше:
+try:
+    # Для выбора ошибки используется raise
+    raise IndexError("Это IndexError")
+except IndexError as e:
+    # pass это просто отсутствие оператора. Обычно здесь происходит
+    # восстановление от ошибки.
+    pass
+
+
+####################################################
+## 4. Функции
+####################################################
+
+# Используйте def для создания новых функций
+def add(x, y):
+    print "x равен %s, а y равен %s" % (x, y)
+    return x + y    # Возвращайте результат выражением return
+
+# Вызов функции с аргументами
+add(5, 6) #=> prints out "x равен 5, а y равен 6" и возвращает 11
+
+# Другой способ вызова функции с аргументами
+add(y=6, x=5)   # Именованные аргументы можно указывать в любом порядке.
+
+# Вы можете определить функцию, принимающую неизвестное количество аргументов
+def varargs(*args):
+    return args
+
+varargs(1, 2, 3) #=> (1,2,3)
+
+
+# А также можете определить функцию, принимающую изменяющееся количество 
+# именованных аргументов
+def keyword_args(**kwargs):
+    return kwargs
+
+# Вызовем эту функцию и посмотрим, что из этого получится
+keyword_args(big="foot", loch="ness") #=> {"big": "foot", "loch": "ness"}
+
+# Если хотите, можете использовать оба способа одновременно
+def all_the_args(*args, **kwargs):
+    print args
+    print kwargs
+"""
+all_the_args(1, 2, a=3, b=4) выводит:
+    (1, 2)
+    {"a": 3, "b": 4}
+"""
+
+# Вызывая функции, можете сделать наоборот!
+# Используйте символ * для передачи кортежей и ** для передачи словарей
+args = (1, 2, 3, 4)
+kwargs = {"a": 3, "b": 4}
+all_the_args(*args) # эквивалент foo(1, 2, 3, 4)
+all_the_args(**kwargs) # эквивалент foo(a=3, b=4)
+all_the_args(*args, **kwargs) # эквивалент foo(1, 2, 3, 4, a=3, b=4)
+
+# Python имеет функции первого класса
+def create_adder(x):
+    def adder(y):
+        return x + y
+    return adder
+
+add_10 = create_adder(10)
+add_10(3) #=> 13
+
+# Также есть и анонимные функции
+(lambda x: x > 2)(3) #=> True
+
+# Есть встроенные функции высшего порядка
+map(add_10, [1,2,3]) #=> [11, 12, 13]
+filter(lambda x: x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
+
+# Мы можем использовать списки для удобного отображения и фильтрации
+[add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5] #=> [6, 7]
+
+####################################################
+## 5. Классы
+####################################################
+
+# Чтобы получить класс, мы наследуемся от object.
+class Human(object):
+
+    # Атрибут класса. Он разделяется всеми экземплярами этого класса
+    species = "H. sapiens"
+
+    # Обычный конструктор
+    def __init__(self, name):
+        # Присваивание значения аргумента атрибуту класса name
+        self.name = name
+
+    # Метод экземпляра. Все методы принимают self в качестве первого аргумента
+    def say(self, msg):
+       return "%s: %s" % (self.name, msg)
+
+    # Метод класса разделяется между всеми экземплярами
+    # Они вызываются с указыванием вызывающего класса в качестве первого аргумента
+    @classmethod
+    def get_species(cls):
+        return cls.species
+
+    # Статический метод вызывается без ссылки на класс или экземпляр
+    @staticmethod
+    def grunt():
+        return "*grunt*"
+
+
+# Инстанцирование класса
+i = Human(name="Иван")
+print i.say("привет")     # выводит "Иван: привет"
+
+j = Human("Петр")
+print j.say("Привет")  #выводит "Петр: привет"
+
+# Вызов метода класса
+i.get_species() #=> "H. sapiens"
+
+# Присвоение разделяемому атрибуту
+Human.species = "H. neanderthalensis"
+i.get_species() #=> "H. neanderthalensis"
+j.get_species() #=> "H. neanderthalensis"
+
+# Вызов статического метода
+Human.grunt() #=> "*grunt*"
+
+
+####################################################
+## 6. Модули
+####################################################
+
+# Вы можете импортировать модули
+import math
+print math.sqrt(16) #=> 4
+
+# Вы можете импортировать отдельные функции модуля
+from math import ceil, floor
+print ceil(3.7)  #=> 4.0
+print floor(3.7) #=> 3.0
+
+# Можете импортировать все функции модуля.
+# Предупреждение: не рекомендуется
+from math import *
+
+# Можете сокращать имена модулей
+import math as m
+math.sqrt(16) == m.sqrt(16) #=> True
+
+# Модули в Python это обычные файлы с кодом python. Вы
+# можете писать свои модули и импортировать их. Название
+# модуля совпадает с названием файла.
+
+# Вы можете узнать, какие функции и атрибуты определены 
+# в модуле
+import math
+dir(math)
+
+
+```
+
+## Хочется большего?
+
+### Бесплатные онлайн-материалы
+
+* [Learn Python The Hard Way](http://learnpythonthehardway.org/book/)
+* [Dive Into Python](http://www.diveintopython.net/)
+* [The Official Docs](http://docs.python.org/2.6/)
+* [Hitchhiker's Guide to Python](http://docs.python-guide.org/en/latest/)
+* [Python Module of the Week](http://pymotw.com/2/)
+
+### Готовьте деньги
+
+* [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20)
+* [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20)
+* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)
+
diff --git a/ru-ru/ruby-ru.html.markdown b/ru-ru/ruby-ru.html.markdown
new file mode 100644
index 00000000..0a8fbb09
--- /dev/null
+++ b/ru-ru/ruby-ru.html.markdown
@@ -0,0 +1,398 @@
+---
+language: ruby
+lang: ru-ru
+filename: learnruby-ru.rb
+contributors:
+  - ["David Underwood", "http://theflyingdeveloper.com"]
+  - ["Joel Walden", "http://joelwalden.net"]
+  - ["Luke Holder", "http://twitter.com/lukeholder"]
+  - ["Tristan Hume", "http://thume.ca/"]
+  - ["Nick LaMuro", "https://github.com/NickLaMuro"]
+  - ["Alexey Makarov", "https://github.com/Anakros"]
+---
+
+```ruby
+# Это комментарий
+
+=begin
+Это многострочный комментарий
+Никто их не использует
+И они не рекомендуются к использованию
+=end
+
+# Первое и самое главное: Всё является объектом.
+
+# Числа это объекты
+
+3.class #=> Fixnum
+
+3.to_s #=> "3"
+
+
+# Немного простой арифметики
+1 + 1 #=> 2
+8 - 1 #=> 7
+10 * 2 #=> 20
+35 / 5 #=> 7
+
+# Арифметика -- это синтаксический сахар
+# над вызовом метода для объекта
+1.+(3) #=> 4
+10.* 5 #=> 50
+
+# Логические величины -- это объекты
+nil # Здесь ничего нет
+true # правда
+false # ложь
+
+nil.class #=> NilClass
+true.class #=> TrueClass
+false.class #=> FalseClass
+
+# Операция равенства
+1 == 1 #=> true
+2 == 1 #=> false
+
+# Операция неравенства
+1 != 1 #=> false
+2 != 1 #=> true
+!true  #=> false
+!false #=> true
+
+# nil -- имеет такое же логическое значение, как и false
+
+!nil   #=> true
+!false #=> true
+!0     #=> false
+
+# Больше операций сравнения
+1 < 10 #=> true
+1 > 10 #=> false
+2 <= 2 #=> true
+2 >= 2 #=> true
+
+# Строки -- это объекты
+
+'Я строка'.class #=> String
+"Я тоже строка".class #=> String
+
+placeholder = "использовать интерполяцию строк"
+"Я могу #{placeholder}, когда создаю строку с двойными кавычками"
+#=> "Я могу использовать интерполяцию строк, когда создаю строку с двойными кавычками"
+
+
+# печатать в стандартный вывод
+puts "Я печатаюсь!"
+
+# Переменные
+x = 25 #=> 25
+x #=> 25
+
+# Присваивание значения возвращает то самое присвоенное значение.
+# Это позволяет делать множественные присваивания:
+
+x = y = 10 #=> 10
+x #=> 10
+y #=> 10
+
+# По соглашению, используйте snake_case для имён переменных
+snake_case = true
+
+# Используйте подробные имена для переменных
+# Но не переборщите!
+path_to_project_root = '/good/name/'
+path = '/bad/name/'
+
+# Идентификаторы (тоже объекты)
+
+# Идентификаторы -- это неизменяемые, многоразовые константы. 
+# Для каждого идентификатора (кроме текста) сохраняется цифровой хэш. При последующем
+# использовании идентификатора, заместо создания нового объекта, будет найден уже
+# существующий по цифровому хэшу. Они часто используются вместо строк
+# для ускорения работы приложений
+
+:pending.class #=> Symbol
+
+status = :pending
+
+status == :pending #=> true
+
+status == 'pending' #=> false
+
+status == :approved #=> false
+
+# Массивы
+
+# Это массив
+array = [1, 2, 3, 4, 5] #=> [1, 2, 3, 4, 5]
+
+# Массив может содержать различные типы значений
+
+[1, "hello", false] #=> [1, "hello", false]
+
+# Значение в массиве можно получить по индексу с левой границы
+array[0] #=> 1
+array[12] #=> nil
+
+# Как и арифметика, доступ к значению в массиве
+# это синтаксический сахар над вызовом метода для объекта
+array.[] 0 #=> 1
+array.[] 12 #=> nil
+
+# Также, можно получить по индексу с правой границы
+array[-1] #=> 5
+
+# С заданными левой и правой границами индексов
+array[2, 4] #=> [3, 4, 5]
+
+# Или с использованием диапазона значений
+array[1..3] #=> [2, 3, 4]
+
+# Вот так можно добавить значение в массив
+array << 6 #=> [1, 2, 3, 4, 5, 6]
+
+# Хэши -- это массив пар "ключ => значение".
+# Хэши объявляются с использованием фигурных скобок:
+hash = {'color' => 'green', 'number' => 5}
+
+hash.keys #=> ['color', 'number']
+
+# Значение в хэше легко может быть найдено по ключу:
+hash['color'] #=> 'green'
+hash['number'] #=> 5
+
+# Поиск по ключу, которого в хэше нет вернёт nil:
+hash['nothing here'] #=> nil
+
+# начиная с Ruby 1.9, существует специальный синтаксис 
+# при использовании идентификаторов как ключей хэша:
+
+new_hash = { defcon: 3, action: true}
+
+new_hash.keys #=> [:defcon, :action]
+
+# Массивы и Хэши -- перечисляемые типы данных
+# У них есть много полезных методов, например: each, map, count и другие
+
+# Управление ходом выполнения (Управляющие структуры)
+
+if true
+  "if условие"
+elsif false
+  "else if, условие"
+else
+  "else, условие"
+end
+
+for counter in 1..5
+  puts "#итерация {counter}"
+end
+#=> итерация 1
+#=> итерация 2
+#=> итерация 3
+#=> итерация 4
+#=> итерация 5
+
+# Однако, никто не использует "for" для циклов.
+# Вместо него Вы должны использовать метод "each" вместе с блоком кода.
+#
+# Блок кода -- это один из вариантов создания замыканий (лямбды, анонимные функции). 
+# Блок может только передаваться методу, сам по себе он существовать не может.
+# "for" не имеет своей области видимости и все переменные, объявленные в нём
+# будут доступны отовсюду. "each" вместе с блоком создаёт свою область видимости.
+
+# Метод "each" для диапазона значений запускает блок кода один раз
+# для каждого из значений диапазона
+# Блок передаёт счётчик (counter) в качестве параметра.
+# Вызов метода "each" с блоком выглядит следующим образом:
+
+(1..5).each do |counter|
+  puts "итерация #{counter}"
+end
+#=> итерация 1
+#=> итерация 2
+#=> итерация 3
+#=> итерация 4
+#=> итерация 5
+
+# Вы также можете ограничивать блоки фигурными скобками:
+(1..5).each {|counter| puts "итерация #{counter}"}
+
+# Содержимое управляющих структур также можно перебирать используя "each":
+array.each do |element|
+  puts "#{element} -- часть массива"
+end
+hash.each do |key, value|
+  puts "#{key} -- это #{value}"
+end
+
+counter = 1
+while counter <= 5 do
+  puts "итерация #{counter}"
+  counter += 1
+end
+#=> итерация 1
+#=> итерация 2
+#=> итерация 3
+#=> итерация 4
+#=> итерация 5
+
+grade = 'B'
+
+case grade
+when 'A'
+  puts "Так держать, детка!"
+when 'B'
+  puts "Тебе повезёт в следующий раз"
+when 'C'
+  puts "Ты можешь сделать лучше"
+when 'D'
+  puts "Выскоблил последнее"
+when 'F'
+  puts "Ты провалился!"
+else
+  puts "Альтернативная система оценок, да?"
+end
+
+# Функции
+
+def double(x)
+  x * 2
+end
+
+# Функции (и все блоки) неявно возвращают значение последней операции
+double(2) #=> 4
+
+# Скобки необязательны, если возвращаемый результат однозначен
+double 3 #=> 6
+
+double double 3 #=> 12
+
+def sum(x,y)
+  x + y
+end
+
+# Аргументы метода разделены запятой
+sum 3, 4 #=> 7
+
+sum sum(3,4), 5 #=> 12
+
+# yield
+# Все методы имеют неявный, опциональный параметр,
+# который может быть вызван с помощью инструкции "yield"
+
+def surround
+  puts "{"
+  yield
+  puts "}"
+end
+
+surround { puts 'hello world' }
+
+# {
+# hello world
+# }
+
+
+# Определение класса с помощью ключевого слова "class"
+class Human
+
+  # Переменная класса, она является общей для всех экземпляров класса
+  @@species = "H. sapiens"
+
+  # Базовый метод-конструктор
+  def initialize(name, age=0)
+    # Присвоить аргумент "name" переменной "name" экземпляра класса
+    @name = name
+    # Если аргумент "age" не задан,
+    # мы используем значение по умолчанию из списка аргументов
+    @age = age
+  end
+
+  # Базовый метод установки значения для переменной (setter)
+  def name=(name)
+    @name = name
+  end
+
+  # Базовый метод получения значения переменной (getter)
+  def name
+    @name
+  end
+
+  # Метод класса определяется с ключевым словом "self",
+  # чтобы можно было отличить его от метода экземпляра класса.
+  # Он может быть вызван только на уровне класса, но не экземпляра.
+  def self.say(msg)
+    puts "#{msg}"
+  end
+
+  def species
+    @@species
+  end
+
+end
+
+
+# Создание экземпляра класса
+jim = Human.new("Jim Halpert")
+
+dwight = Human.new("Dwight K. Schrute")
+
+# Давайте вызовем несколько методов
+jim.species #=> "H. sapiens"
+jim.name #=> "Jim Halpert"
+jim.name = "Jim Halpert II" #=> "Jim Halpert II"
+jim.name #=> "Jim Halpert II"
+dwight.species #=> "H. sapiens"
+dwight.name #=> "Dwight K. Schrute"
+
+# Вызов метода класса
+Human.say("Hi") #=> "Hi"
+
+# Класс тоже объект в Ruby. Потому класс может иметь переменные экземпляра.
+# Переменная класса доступна в классе, его экземплярах и его потомках.
+
+# Базовый класс
+class Human
+  @@foo = 0
+
+  def self.foo
+    @@foo
+  end
+
+  def self.foo=(value)
+    @@foo = value
+  end
+end
+
+#  Производный класс (класс-потомок)
+class Worker < Human
+end
+
+Human.foo # 0
+Worker.foo # 0
+
+Human.foo = 2 # 2
+Worker.foo # 2
+
+# Переменная экземпляра класса недоступна в потомках этого класса.
+
+class Human
+  @bar = 0
+
+  def self.bar
+    @bar
+  end
+
+  def self.bar=(value)
+    @bar = value
+  end
+end
+
+class Doctor < Human
+end
+
+Human.bar # 0
+Doctor.bar # nil
+
+```
diff --git a/ruby-ecosystem.html.markdown b/ruby-ecosystem.html.markdown
index a31f552d..c2a2087b 100644
--- a/ruby-ecosystem.html.markdown
+++ b/ruby-ecosystem.html.markdown
@@ -63,7 +63,7 @@ Very mature/compatible:
 
 * MRI - Written in C, this is the reference implementation of ruby. By
   definition it is 100% compatible (with itself). All other rubies
-maintain capatability with MRI (see RubySpec below).
+maintain compatibility with MRI (see [RubySpec](#rubyspec) below).
 * JRuby - Written in Java and ruby, this robust implementation is quite fast.
   Most importantly, JRuby's strength is JVM/Java interop, leveraging existing
 JVM tools, projects, and languages.
@@ -81,7 +81,7 @@ development.
 Less mature/compatible:
 
 * Topaz - Written in RPython (using the PyPy toolchain), Topaz is fairly young
-  and not yet compatable. It shows promise to be a high-performance ruby
+  and not yet compatible. It shows promise to be a high-performance ruby
 implementation.
 * IronRuby - Written in C# targeting the .NET platform, work on IronRuby seems
   to have stopped since Microsoft pulled their support.
@@ -93,13 +93,13 @@ which MRI version to target.
 
 ## RubySpec
 
-Most ruby implementations rely heavily on (RubySpec)[http://rubyspec.org/]. Ruby
+Most ruby implementations rely heavily on [RubySpec](http://rubyspec.org/). Ruby
 has no official specification, so the community has written executable specs in
 ruby to test their implementations' compatability with MRI.
 
 ## RubyGems
 
-(RubyGems)[http://rubygems.org/] is a community-run package manager for ruby.
+[RubyGems](http://rubygems.org/) is a community-run package manager for ruby.
 RubyGems ships with ruby, so there is no need to download it separately.
 
 Ruby packages are called "gems," and they can be hosted by the community at
@@ -108,7 +108,7 @@ things like version, dependencies, author(s), and license(s).
 
 ## Bundler
 
-(Bundler)[http://bundler.io/] is a gem dependency resolver. It uses a project's
+[Bundler](http://bundler.io/) is a gem dependency resolver. It uses a project's
 Gemfile to find dependencies, and then fetches those dependencies' dependencies
 recursively. It does this until all dependencies are resolved and downloaded, or
 it will stop if a conflict has been found.
diff --git a/ruby.html.markdown b/ruby.html.markdown
index 861a94ad..3a233d98 100644
--- a/ruby.html.markdown
+++ b/ruby.html.markdown
@@ -5,6 +5,8 @@ contributors:
   - ["David Underwood", "http://theflyingdeveloper.com"]
   - ["Joel Walden", "http://joelwalden.net"]
   - ["Luke Holder", "http://twitter.com/lukeholder"]
+  - ["Tristan Hume", "http://thume.ca/"]
+  - ["Nick LaMuro", "https://github.com/NickLaMuro"]
 ---
 
 ```ruby
@@ -34,7 +36,7 @@ You shouldn't either
 # Arithmetic is just syntactic sugar
 # for calling a method on an object
 1.+(3) #=> 4
-10.* 5 #=> 50 
+10.* 5 #=> 50
 
 # Special values are objects
 nil # Nothing to see here
@@ -116,11 +118,11 @@ status == :approved #=> false
 # Arrays
 
 # This is an array
-[1, 2, 3, 4, 5] #=> [1, 2, 3, 4, 5]
+array = [1, 2, 3, 4, 5] #=> [1, 2, 3, 4, 5]
 
 # Arrays can contain different types of items
 
-array = [1, "hello", false] #=> => [1, "hello", false]
+[1, "hello", false] #=> [1, "hello", false]
 
 # Arrays can be indexed
 # From the front
@@ -158,11 +160,6 @@ hash['number'] #=> 5
 # Asking a hash for a key that doesn't exist returns nil:
 hash['nothing here'] #=> nil
 
-# Iterate over hashes with the #each method:
-hash.each do |k, v|
-  puts "#{k} is #{v}"
-end
-
 # Since Ruby 1.9, there's a special syntax when using symbols as keys:
 
 new_hash = { defcon: 3, action: true}
@@ -177,9 +174,9 @@ new_hash.keys #=> [:defcon, :action]
 if true
   "if statement"
 elsif false
- "else if, optional"
+  "else if, optional"
 else
- "else, also optional"
+  "else, also optional"
 end
 
 for counter in 1..5
@@ -191,9 +188,15 @@ end
 #=> iteration 4
 #=> iteration 5
 
-# HOWEVER
-# No-one uses for loops
-# Use `each` instead, like this:
+# HOWEVER, No-one uses for loops.
+# Instead you should use the "each" method and pass it a block.
+# A block is a bunch of code that you can pass to a method like "each".
+# It is analogous to lambdas, anonymous functions or closures in other
+# programming languages.
+#
+# The "each" method of a range runs the block once for each element of the range.
+# The block is passed a counter as a parameter.
+# Calling the "each" method with a block looks like this:
 
 (1..5).each do |counter|
   puts "iteration #{counter}"
@@ -204,6 +207,17 @@ end
 #=> iteration 4
 #=> iteration 5
 
+# You can also surround blocks in curly brackets:
+(1..5).each {|counter| puts "iteration #{counter}"}
+
+# The contents of data structures can also be iterated using each.
+array.each do |element|
+  puts "#{element} is part of the array"
+end
+hash.each do |key, value|
+  puts "#{key} is #{value}"
+end
+
 counter = 1
 while counter <= 5 do
   puts "iteration #{counter}"
@@ -228,7 +242,7 @@ when 'D'
   puts "Scraping through"
 when 'F'
   puts "You failed!"
-else 
+else
   puts "Alternative grading system, eh?"
 end
 
@@ -238,7 +252,7 @@ def double(x)
   x * 2
 end
 
-# Functions (and all blocks) implcitly return the value of the last statement
+# Functions (and all blocks) implicitly return the value of the last statement
 double(2) #=> 4
 
 # Parentheses are optional where the result is unambiguous
diff --git a/tr-tr/c-tr.html.markdown b/tr-tr/c-tr.html.markdown
new file mode 100644
index 00000000..50bca246
--- /dev/null
+++ b/tr-tr/c-tr.html.markdown
@@ -0,0 +1,484 @@
+---
+name: c
+category: language
+language: c
+filename: learnc-tr.c
+contributors:
+    - ["Adam Bard", "http://adambard.com/"]
+translators:
+    - ["Haydar KULEKCI", "http://scanf.info/"]
+lang: tr-tr
+
+---
+/*
+C halen modern yüksek performans bilgisayarların dili.
+
+C bir çok programcının kullandığı en düşük seviye dillerdendir, ama
+salt hız ile daha fazlasını karşılar. C'nin bellek yönetiminden iyi
+anlarsanız sizi isteğiniz yere götürecektir.
+
+```c
+// Tek satır yorum // karakterleri ile başlar
+
+/*
+Çoklu satırlı yorumlar bu şekilde görünür.
+*/
+
+// C Standart kütüphanelerini uygulamanıza #include<ornek.h> ile 
+// dahil edebilirsiniz.
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+// Kendi başlık(header) dosyalarınız dahil etmek için "çift tırnak" 
+// kullanmalısınız.
+#include "my_header.h"
+
+// Fonksiyonlarınızı bir .h dosyasında ya da c dosyanızın üst tarafta 
+// tanımlayın.
+
+void function_1();
+void function_2();
+
+// Programınızın giriş noktası main isimli bir fonksiyondur ve 
+// integer değer döner
+int main() {
+
+    // çıktıları yazdırmak için printf kullanılır, "print formatted"
+    // %d bir sayı tipidir, \n yeni satır karakteridir
+    printf("%d\n", 0); // => 0 karakteri yazdırılır.
+    // Tüm ifadeler noktalı virgül ile bitmelidir.
+
+    ///////////////////////////////////////
+    // Tipler
+    ///////////////////////////////////////
+
+    // Değişkenleri kullanmadan önce tanımlamalısınız. Bir değişken tanımlarken
+    // tipini belirtmelisiniz; bu tip onun byte olarak boyutunu belirler.
+
+    // int değişken tipi 4 byte boyutundadır.
+    int x_int = 0;
+
+    // short değişken tipi genellikle 2 byte boyutundadır.
+    short x_short = 0;
+
+    // char tipi 1 byte boyutunu garanti eder. 
+    char x_char = 0;
+    char y_char = 'y'; // Karakterler '' işaretleri arasına yazılır.
+
+    // long tipi 4-8 byte olur; long long tipi en azından 64 bit garantiler.
+    long x_long = 0;
+    long long x_long_long = 0; 
+
+    // float tipi 32-bit kayan noktalı sayı boyutundadır.
+    float x_float = 0.0;
+
+    // double değişken tipi 64-bit kayan noktalı yazı tipindedir. 
+    double x_double = 0.0;
+
+    // Integral türleri işaretsiz olabilir. Bunun anlamı, onlar eksi değer 
+    // olamaz demektir, ama aynı boyuttaki işaretsiz bir sayının maksimum 
+    // değeri işaretli bir sayının maksimum değeriden büyük olur.
+    unsigned char ux_char;
+    unsigned short ux_short;
+    unsigned int ux_int;
+    unsigned long long ux_long_long;
+
+    // Diğer taraftan char, ki her zaman bir byte boyutundadır, bu tipler 
+    // makinenize göre boyut değiştirir. sizeof(T) size bir değişkenin byte 
+    // cinsinden boyutunu verir öyle ki bu tipin boyutunu taşınabilir bir 
+    // şekilde ifade edilebilir
+    // Örneğin,
+    printf("%lu\n", sizeof(int)); // => 4 (bir çok makinede 4-byte words)
+
+    // If the argument of the `sizeof` operator an expression, then its argument
+    // is not evaluated (except VLAs (see below)).
+    // The value it yields in this case is a compile-time constant.
+    int a = 1;
+    size_t size = sizeof(a++); // a++ is not evaluated
+    printf("sizeof(a++) = %zu where a = %d\n", size, a);
+    // prints "sizeof(a++) = 4 where a = 1" (on a 32-bit architecture)
+
+    // Diziler somut bir boyut ile oluşturulmalıdır.
+    char my_char_array[20]; // Bu dizi 1 * 20 = 20 byte alan kaplar
+    int my_int_array[20]; // Bu dizi 4 * 20 = 80 byte alan kaplar
+                          // (4-byte bir word varsayılır)
+
+    // Şu şekilde bir diziyi 0 ile oluşturabilirsiniz:
+    char my_array[20] = {0};
+
+    // Dizinin elemanlarını indexlemek diğer diller gibidir, veya 
+    // diğer diller C gibi.
+    my_array[0]; // => 0
+
+    // Diziler değişebilirdir (mutable); O sadece memory!
+    my_array[1] = 2;
+    printf("%d\n", my_array[1]); // => 2
+
+    // In C99 (and as an optional feature in C11), variable-length arrays (VLAs)
+    // can be declared as well. The size of such an array need not be a compile
+    // time constant:
+    printf("Enter the array size: "); // ask the user for an array size
+    char buf[0x100];
+    fgets(buf, sizeof buf, stdin);
+
+    // strtoul parses a string to an unsigned integer
+    size_t size = strtoul(buf, NULL, 10);
+    int var_length_array[size]; // declare the VLA
+    printf("sizeof array = %zu\n", sizeof var_length_array);
+
+    // A possible outcome of this program may be:
+    // > Enter the array size: 10
+    // > sizeof array = 40
+
+    // String'ler bir NUL (0x00) byte ile sonlandırılmış karakter dizileridir,
+    // bu string içerisinde özel bir karakter olan '\0' ile gösterilir.
+    // (Biz Nul byte'i string karakterleri arasında bulundurmamıza gerek 
+    // yoktur; derleyici onu bizim için dizinin sonuna ekler.)
+    char a_string[20] = "This is a string";
+    printf("%s\n", a_string); // %s bir string formatıdır.
+
+    /*
+    a_string 16 karakter uzunluğundadır. 
+    17. karakter NUL karakteridir.
+    18., 19. ve 20. karakterler tanımsızdır.(undefined)
+    */
+
+    printf("%d\n", a_string[16]); // => 0
+    // i.e., byte #17 is 0 (as are 18, 19, and 20)
+
+    // If we have characters between single quotes, that's a character literal.
+    // It's of type `int`, and *not* `char` (for historical reasons).
+    int cha = 'a'; // fine
+    char chb = 'a'; // fine too (implicit conversion from int to char)
+
+    ///////////////////////////////////////
+    // Operatörler
+    ///////////////////////////////////////
+
+    int i1 = 1, i2 = 2; // Çoklu tanımlama için kısayol.
+    float f1 = 1.0, f2 = 2.0;
+
+    // Aritmatik basittir.
+    i1 + i2; // => 3
+    i2 - i1; // => 1
+    i2 * i1; // => 2
+    i1 / i2; // => 0 (0.5'dir ama 0 a yuvarlanmıştır.)
+
+    f1 / f2; // => 0.5, artı veya eksi epsilon
+
+    // Modüler aritmetikte vardır.
+    11 % 3; // => 2
+
+    // Karşılaştırma operatörleri muhtemelen tanıdıktır, ama
+    // C'de boolean tipi yoktur. Bunun yerine sayı(int) kullanırız.
+    // 0 false yerine ve diğer herşey true yerine geçmektedir. 
+    // (Karşılaştırma operatörleri her zaman 0 veya 1 dönmektedir.)
+    3 == 2; // => 0 (false)
+    3 != 2; // => 1 (true)
+    3 > 2; // => 1
+    3 < 2; // => 0
+    2 <= 2; // => 1
+    2 >= 2; // => 1
+
+    // Sayılar üzerinde mantık işlemleri
+    !3; // => 0 (Logical not)
+    !0; // => 1
+    1 && 1; // => 1 (Logical and)
+    0 && 1; // => 0
+    0 || 1; // => 1 (Logical or)
+    0 || 0; // => 0
+
+    // Bit boyutunda işlem yapmak için operatörler
+    ~0x0F; // => 0xF0 (bitwise negation)
+    0x0F & 0xF0; // => 0x00 (bitwise AND)
+    0x0F | 0xF0; // => 0xFF (bitwise OR)
+    0x04 ^ 0x0F; // => 0x0B (bitwise XOR)
+    0x01 << 1; // => 0x02 (bitwise left shift (by 1))
+    0x02 >> 1; // => 0x01 (bitwise right shift (by 1))
+
+    // Be careful when shifting signed integers - the following are undefined:
+    // - shifting into the sign bit of a signed integer (int a = 1 << 32)
+    // - left-shifting a negative number (int a = -1 << 2)
+    // - shifting by an offset which is >= the width of the type of the LHS:
+    //   int a = 1 << 32; // UB if int is 32 bits wide
+
+    ///////////////////////////////////////
+    // Kontrol Yapıları
+    ///////////////////////////////////////
+
+    if (0) {
+      printf("I am never run\n");
+    } else if (0) {
+      printf("I am also never run\n");
+    } else {
+      printf("I print\n");
+    }
+
+    // While Döngüsü
+    int ii = 0;
+    while (ii < 10) {
+        printf("%d, ", ii++); // ii++, ii değişkenini değerini kullandıktan sonra artırır.
+    } // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
+
+    printf("\n");
+
+    int kk = 0;
+    do {
+        printf("%d, ", kk);
+    } while (++kk < 10); // ++kk, kk değişkeninin değerini kullanmadan önce artırır.
+    // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
+
+    printf("\n");
+
+    // For Döngüsü
+    int jj;
+    for (jj=0; jj < 10; jj++) {
+        printf("%d, ", jj);
+    } // => prints "0, 1, 2, 3, 4, 5, 6, 7, 8, 9, "
+
+    printf("\n");
+
+    ///////////////////////////////////////
+    // Tip Dönüşümleri
+    ///////////////////////////////////////
+
+    // C'de her değer bir tipe sahiptir, ama siz bir değeri bir başka tipe 
+    // dönüştürebilirsiniz.
+
+    int x_hex = 0x01; // Hex literatüründe değer atayabilirsiniz.
+
+    // Türler arasındaki dönüşümde kendi değerini korumak için çalışacaktır.
+    printf("%d\n", x_hex); // => Prints 1
+    printf("%d\n", (short) x_hex); // => Prints 1
+    printf("%d\n", (char) x_hex); // => Prints 1
+
+    // Tip hiçbir hata vermeden taşacaktır(overflow).
+    printf("%d\n", (unsigned char) 257); // => 1 (Max char = 255 eğer karakter 8 bit uzunluğunda ise)
+
+    // `char`, `signed char` ve `unsigned char` karakter tiplerinin maksimum uzunluğunu 
+    // belirlemek için <limits.h> kütüphanesindeki CHAR_MAX, SCHAR_MAX ve UCHAR_MAX 
+    // macrolarını kullanınız.
+
+    // Integral tipi kayan noktalı yazı tipine dönüştürülecektir ve tam tersi. 
+    printf("%f\n", (float)100); // %f formats a float
+    printf("%lf\n", (double)100); // %lf formats a double
+    printf("%d\n", (char)100.0);
+
+    ///////////////////////////////////////
+    // İşaretçiler (Pointers)
+    ///////////////////////////////////////
+
+    // Bir işaretci bellek adresini barındıran bir değişkendir. Tanımlaması ile işaret 
+    // edeceği verinin tipi de belirtilecektir. Değişkenlerininzi bellek adreslerini 
+    // getirerek bellek ile ilgili karışıklığı ortadan kaldırabilirsiniz. 
+
+    int x = 0;
+    printf("%p\n", &x); // & işareti bir değişkenin bellek adresini getirmek için kullanılır. 
+    // (%p işaretçilerin formatıdır)
+    // => Bazı bellek adresleri yazdırılacaktır.
+
+
+    // İşaretçiler tanımlanırken * ile başlar
+    int *px, not_a_pointer; // px sayı tipinde bir işaretçidir. 
+    px = &x; // X değişkeninin bellek adresi px değişkeninde tutulmaktadır.
+    printf("%p\n", px); // => x değişkeninin bellek adresi yazdırılacaktır. 
+    printf("%d, %d\n", (int)sizeof(px), (int)sizeof(not_a_pointer));
+    // => 64-bit sistemde "8, 4" yazdırılacaktır.
+
+    // İşaretçinin adres olarak gösterdiği yerdeki değeri almak için 
+    // değişkenin önüne * işareti ekleyiniz.
+    printf("%d\n", *px); // => 0 bastıracaktır, x in değeridir, 
+                         // çünkü px değişkeni x in adresini göstermektedir.
+
+    // Ayrıca siz işaretçinin gösterdiği yerin değerini 
+    // değiştirebilirsiniz. Burada referansı parantez içerisinde göstereceğiz 
+    // çünkü ++ işleminin önceliği * işleminden yüksektir.
+    (*px)++; // px'in işaret ettiği değeri 1 artır. 
+    printf("%d\n", *px); // => 1 yazdırılır.
+    printf("%d\n", x); // => 1 yazdırılır.
+
+    int x_array[20]; // Diziler(arrays) bellekten yan yana bellek bloklarını 
+                     // tahsis etmek için iyi bir yöntemdir.
+    int xx;
+    for (xx=0; xx<20; xx++) {
+        x_array[xx] = 20 - xx;
+    } // x_array dizisi 20, 19, 18,... 2, 1 değerleri ile oluşturuluyor.
+
+    // Bir sayı tipinde işaretçi tanımlanıyor ve x_array'i işaret ediyor.
+    int* x_ptr = x_array;
+    // x_ptr artık dizinin ilk elemanını işaret etmektedir (the integer 20).
+    // Bu çalışacaktır çünkü diziler(arrays) aslında sadece onların ilk 
+    // elemanlarını gösteren birer işaretçidir.
+    // For example, when an array is passed to a function or is assigned to a pointer,
+    // it decays into (implicitly converted to) a pointer.
+    // Exceptions: when the array is the argument of the `&` (address-od) operator:
+    int arr[10];
+    int (*ptr_to_arr)[10] = &arr; // &arr is NOT of type `int *`!
+                                  // It's of type "pointer to array" (of ten `int`s).
+    // or when the array is a string literal used for initializing a char array:
+    char arr[] = "foobarbazquirk";
+    // or when it's the argument of the `sizeof` or `alignof` operator:
+    int arr[10];
+    int *ptr = arr; // equivalent with int *ptr = &arr[0];
+    printf("%zu %zu\n", sizeof arr, sizeof ptr); // probably prints "40, 4" or "40, 8"
+
+    // Diziler ilk elemanlarını gösteren birer işaretçidirler.
+    printf("%d\n", *(x_ptr)); // => 20 yazılacaktır.
+    printf("%d\n", x_array[0]); // => 20 yazılacaktır.
+
+    // İşaretçiler kendi tiplerinde artırılır ve azaltılır. 
+    printf("%d\n", *(x_ptr + 1)); // => 19 yazılacaktır.
+    printf("%d\n", x_array[1]); // => 19 yazılacaktır.
+
+    // Ayrıca dinamik olarak bir bellek bloğunu standart kütüphanede bulunan 
+    // malloc fonksiyonu ile uygulamanız için ayırabilirsiniz. Bu fonksiyon 
+    // byte türünden ayırmak istediğiniz bloğun boyutunu parametre olarak alır. 
+    int* my_ptr = (int*) malloc(sizeof(int) * 20);
+    for (xx=0; xx<20; xx++) {
+        *(my_ptr + xx) = 20 - xx; // my_ptr[xx] = 20-xx 'de aynı zamanda çalışabilir
+    } // Bellekte 20, 19, 18, 17... 2, 1 (as ints) şeklinde oluşturulmuş olacaktır.
+
+    // Eğer ayrımadığınız bir bellek adresini çağırırsanız
+    // öngörülmeyen bir değer dönecektir. 
+    printf("%d\n", *(my_ptr + 21)); // => kim-bilir-ne-yazacak?
+
+    // Malloc fonksiyonu ile ayrıdığınız bellek kısmı ile işiniz bittiğinde 
+    // onu free fonksiyonu ile boşaltmalısınız, aksi durumda uygulamanız 
+    // kapatılana kadar belleğin o kısmını kimse kullanamaz. 
+    free(my_ptr);
+
+    // Metin Dizileri(String) birer karakter dizisidir(char array), ama
+    // genelde karakter işaretçisi olarak kullanılır.
+    char* my_str = "This is my very own string";
+
+    printf("%c\n", *my_str); // => 'T'
+
+    function_1();
+} // main fonksiyon sonu
+
+///////////////////////////////////////
+// Fonksiyonlar
+///////////////////////////////////////
+
+// Fonksiyon tanımlama sözdizimi:
+// <return type> <fonksiyon adi>(<args>)
+
+int add_two_ints(int x1, int x2){
+    return x1 + x2; // bir değer geri döndürmek için return kullanılır.
+}
+
+/*
+Fonksiyonlar pass-by-value'dür, ama isterseniz işaretçi referanslarını 
+kullanarak fonksiyona gönderilen parametrenin değerini değiştirebilirsiniz. 
+
+Example: Bir metni tersine çevirme
+*/
+
+// Bir void konksiyonu hiç bir değer dönmez
+void str_reverse(char* str_in){
+    char tmp;
+    int ii=0, len = strlen(str_in); // Strlen C'nin standart kütüphanesinin bir fonksiyonu
+    for(ii=0; ii<len/2; ii++){
+        tmp = str_in[ii];
+        str_in[ii] = str_in[len - ii - 1]; // sondan ii'inci elemanı
+        str_in[len - ii - 1] = tmp;
+    }
+}
+
+/*
+char c[] = "This is a test.";
+str_reverse(c);
+printf("%s\n", c); // => ".tset a si sihT"
+*/
+
+///////////////////////////////////////
+// Kullanıcı Tanımlı Tipler ve Yapılar
+///////////////////////////////////////
+
+// Typedef'ler bir tip takma adı oluşturur.
+typedef int my_type;
+my_type my_type_var = 0;
+
+// Struct'lar bir veri koleksiyonudur. 
+struct rectangle {
+    int width;
+    int height;
+};
+
+// It's not generally true that
+// sizeof(struct rectangle) == sizeof(int) + sizeof(int)
+// due to potential padding between the structure members (this is for alignment
+// reasons). [1]
+
+void function_1(){
+
+    struct rectangle my_rec;
+
+    // "." ile yapı üyelerine ulaşılabilir.
+    my_rec.width = 10;
+    my_rec.height = 20;
+
+    // Bir yapının adresini işaretçiye atayabilirsiniz.
+    struct rectangle* my_rec_ptr = &my_rec;
+
+    // İşaretçi üzerinden bir yapıya ulaşabilirsiniz. 
+    (*my_rec_ptr).width = 30;
+
+    // ya da -> işareti ile yapının elemanlarına ulaşabilirsiniz. 
+    my_rec_ptr->height = 10; // (*my_rec_ptr).height = 10; ile aynıdır.
+}
+
+// Kolaylık sağlamak için bir yapıya typedef tanımlayabilirsiniz. 
+typedef struct rectangle rect;
+
+int area(rect r){
+    return r.width * r.height;
+}
+
+///////////////////////////////////////
+// Fonksiyon İşaretçiler
+///////////////////////////////////////
+
+/*
+Çalışma zamanında, fonksiyonların bilinen bir bellek adresleri vardır. Fonksiyon
+işaretçileri fonksiyonları direk olarak çağırmayı sağlayan veya geri bildirim(callback)
+için parametre gönderirken kullanılan başka birer işaretçidirler. Ama, syntax tanımı 
+başlangıçta biraz karışık gelebilir. 
+
+Örnek: bir işaretçiden str_reverse kullanımı
+*/
+void str_reverse_through_pointer(char * str_in) {
+    // f adında bir fonksiyon işaretçisi tanımlanır.
+    void (*f)(char *); // Signature should exactly match the target function.
+    f = &str_reverse; // Assign the address for the actual function (determined at runtime)
+    (*f)(str_in); // Just calling the function through the pointer
+    // f(str_in); // That's an alternative but equally valid syntax for calling it.
+}
+
+/*
+As long as function signatures match, you can assign any function to the same pointer.
+Function pointers are usually typedef'd for simplicity and readability, as follows:
+*/
+
+typedef void (*my_fnp_type)(char *);
+
+// Gerçek bir işaretçi tanımlandığı zaman ki kullanımı:
+// ...
+// my_fnp_type f; 
+
+```
+
+## Daha Fazla Okuma Listesi
+
+[K&R, aka "The C Programming Language"](https://en.wikipedia.org/wiki/The_C_Programming_Language)'in bir kopyasını bulundurmak mükemmel olabilir
+
+Diğer bir iyi kaynak ise [Learn C the hard way](http://c.learncodethehardway.org/book/)
+
+It's very important to use proper spacing, indentation and to be consistent with your coding style in general.
+Readable code is better than clever code and fast code. For a good, sane coding style to adopt, see the
+[Linux kernel coding stlye](https://www.kernel.org/doc/Documentation/CodingStyle).
+
+Diğer taraftan google sizin için bir arkadaş olabilir.
+
+[1] http://stackoverflow.com/questions/119123/why-isnt-sizeof-for-a-struct-equal-to-the-sum-of-sizeof-of-each-member
\ No newline at end of file
diff --git a/whip.html.markdown b/whip.html.markdown
index b8852ecb..3429ec24 100644
--- a/whip.html.markdown
+++ b/whip.html.markdown
@@ -109,18 +109,18 @@ undefined ; user to indicate a value that hasn't been set
 
 ; Dictionaries are Whip's equivalent to JavaScript 'objects' or Python 'dicts'
 ; or Ruby 'hashes': an unordered collection of key-value pairs.
-{"key1":"value1" "key2":2 3:3}
+{"key1" "value1" "key2" 2 3 3}
 
 ; Keys are just values, either identifier, number, or string.
-(def my_dict {my_key:"my_value" "my other key":4})
-; But in Whip, dictionaries get parsed like: value, colon, value;
-; with whitespace between each. So that means
-{"key": "value"
+(def my_dict {my_key "my_value" "my other key" 4})
+; But in Whip, dictionaries get parsed like: value, whitespace, value;
+; with more whitespace between each. So that means
+{"key" "value"
 "another key"
-: 1234
+1234
 }
 ; is evaluated to the same as
-{"key":"value" "another key":1234}
+{"key" "value" "another key" 1234}
 
 ; Dictionary definitions can be accessed used the `at` function
 ; (like strings and lists.)
@@ -220,8 +220,8 @@ undefined ; user to indicate a value that hasn't been set
 (max (1 2 3 4)) ; 4
 ; If value is in list or object
 (elem 1 (1 2 3)) ; true
-(elem "foo" {"foo":"bar"}) ; true
-(elem "bar" {"foo":"bar"}) ; false
+(elem "foo" {"foo" "bar"}) ; true
+(elem "bar" {"foo" "bar"}) ; false
 ; Reverse list order
 (reverse (1 2 3 4)) ; => (4 3 2 1)
 ; If value is even or odd
diff --git a/zh-cn/go-zh.html.markdown b/zh-cn/go-zh.html.markdown
new file mode 100644
index 00000000..8f7cb2af
--- /dev/null
+++ b/zh-cn/go-zh.html.markdown
@@ -0,0 +1,284 @@
+---
+名字：Go
+分类：编程语言
+文件名：learngo.go
+贡献者：
+    - ["Sonia Keys", "https://github.com/soniakeys"]
+    - ["pantaovay", "https://github.com/pantaovay"]
+---
+
+发明Go语言是出于更好地完成工作的需要。Go不是计算机科学的最新发展潮流，但它却提供了解决现实问题的最新最快的方法。
+
+Go拥有命令式语言的静态类型，编译很快，执行也很快，同时加入了对于目前多核CPU的并发计算支持，也有相应的特性来实现大规模编程。
+
+Go语言有非常棒的标准库，还有一个充满热情的社区。
+
+```Go
+// 单行注释
+/* 多行
+    注释 */
+
+// 导入包的子句在每个源文件的开头。
+// Main比较特殊，它用来声明可执行文件，而不是一个库。
+package main
+
+// Import语句声明了当前文件引用的包。
+import (
+    "fmt"       // Go语言标准库中的包
+    "net/http"  // 一个web服务器包
+    "strconv"   // 字符串转换
+)
+
+// 函数声明：Main是程序执行的入口。
+// 不管你喜欢还是不喜欢，反正G就用了花括号来包住函数体。
+func main() {
+    // 往标准输出打印一行。
+    // 用包名fmt限制打印函数。
+    fmt.Println("Hello world!")
+
+    // 调用当前包的另一个函数。
+    beyondHello()
+}
+
+// 函数可以在括号里加参数。
+// 如果没有参数的话，也需要一个空括号。
+func beyondHello() {
+    var x int   // 变量声明，变量必须在使用之前声明。
+    x = 3       // 变量赋值。
+    // 可以用:=来偷懒，它自动把变量类型、声明和赋值都搞定了。
+    y := 4
+    sum, prod := learnMultiple(x, y)        // 多个返回变量的函数
+    fmt.Println("sum:", sum, "prod:", prod) // 简单输出
+    learnTypes()                            // 少于y分钟，学的更多！
+}
+
+// 多变量和多返回值的函数
+func learnMultiple(x, y int) (sum, prod int) {
+    return x + y, x * y // 返回两个值
+}
+
+// 内置变量类型和关键词
+func learnTypes() {
+    // 短声明给你所想。
+    s := "Learn Go!" // String类型
+
+    s2 := `A "raw" string literal
+can include line breaks.` // 同样是String类型
+    
+    // 非ascii字符。Go使用UTF-8编码。
+    g := 'Σ' // rune类型，uint32的别名，使用UTF-8编码
+
+    f := 3.14195 // float64类型，IEEE-754 64位浮点数
+    c := 3 + 4i  // complex128类型，内部使用两个float64表示
+
+    // Var变量可以直接初始化。
+    var u uint = 7  // unsigned 无符号变量，但是实现依赖int型变量的长度
+    var pi float32 = 22. / 7
+
+    // 字符转换
+    n := byte('\n') // byte是uint8的别名
+
+    // 数组类型编译的时候大小固定。
+    var a4 [4] int              // 有4个int变量的数组，初始为0
+    a3 := [...]int{3, 1, 5}     // 有3个int变量的数组，同时进行了初始化
+
+    // Slice 有动态大小。Array和Slice各有千秋，但是使用slice的地方更多些。
+    s3 := []int{4, 5, 9}        // 和a3相比，这里没有省略号
+    s4 := make([]int, 4)        // 分配一个有4个int型变量的slice，全部被初始化为0
+
+    var d2 [][]float64          // 声明而已，什么都没有分配
+    bs := []byte("a slice")     // 类型转换的语法
+
+    p, q := learnMemory()       // 声明p,q为int型变量的指针
+    fmt.Println(*p, *q)         // * 取值
+
+    // Map是动态可增长关联数组，和其他语言中的hash或者字典相似。
+    m := map[string]int{"three": 3, "four": 4}
+    m["one"] = 1
+
+    // 在Go语言中未使用的变量在编译的时候会报错，而不是warning。
+    // 下划线 _ 可以使你“使用”一个变量，但是丢弃它的值。
+    _,_,_,_,_,_,_,_,_ = s2, g, f, u, pi, n, a3, s4, bs
+    // 输出变量
+    fmt.Println(s, c, a4, s3, d2, m)
+
+    learnFlowControl() // 回到流程控制 
+}
+
+// Go全面支持垃圾回收。Go有指针，但是不支持指针运算。
+// 你会因为空指针而犯错，但是不会因为增加指针而犯错。
+func learnMemory() (p, q *int) {
+    // 返回int型变量指针p和q
+    p = new(int)    // 内置函数new分配内存
+    // 自动将分配的int赋值0，p不再是空的了。
+    s := make([]int, 20)    // 给20个int变量分配一块内存
+    s[3] = 7                // 赋值
+    r := -2                 // 声明另一个局部变量
+    return &s[3], &r        // & 取址
+}
+
+func expensiveComputation() int {
+    return 1e6
+}
+
+func learnFlowControl() {
+    // If需要花括号，括号就免了
+    if true {
+        fmt.Println("told ya")
+    }
+    // 用go fmt 命令可以帮你格式化代码，所以不用怕被人吐槽代码风格了，
+    // 也不用容忍被人的代码风格。
+    if false {
+        // pout
+    } else {
+        // gloat
+    }
+    // 如果太多嵌套的if语句，推荐使用switch
+    x := 1
+    switch x {
+    case 0:
+    case 1:
+        // 隐式调用break语句，匹配上一个即停止
+    case 2:
+        // 不会运行
+    }
+    // 和if一样，for也不用括号
+    for x := 0; x < 3; x++ { // ++ 自增
+        fmt.Println("iteration", x)
+    }
+    // x在这里还是1。为什么？
+
+    // for 是go里唯一的循环关键字，不过它有很多变种
+    for { // 无限循环
+        break    // 骗你的 
+        continue // 不会运行的
+    }
+    // 和for一样，if中的:=先给y赋值，然后再和x作比较。
+    if y := expensiveComputation(); y > x {
+        x = y
+    }
+    // 闭包函数
+    xBig := func() bool {
+        return x > 100 // x是上面声明的变量引用
+    }
+    fmt.Println("xBig:", xBig()) // true （上面把y赋给x了） 
+    x /= 1e5                     // x变成10
+    fmt.Println("xBig:", xBig()) // 现在是false
+
+    // 当你需要goto的时候，你会爱死它的！
+    goto love
+love:
+
+    learnInterfaces() // 好东西来了！
+}
+
+// 定义Stringer为一个接口类型，有一个方法String
+type Stringer interface {
+    String() string
+}
+
+// 定义pair为一个结构体，有x和y两个int型变量。
+type pair struct {
+    x, y int
+}
+
+// 定义pair类型的方法，实现Stringer接口。
+func (p pair) String() string { // p被叫做“接收器”
+    // Sprintf是fmt包中的另一个公有函数。
+    // 用 . 调用p中的元素。
+    return fmt.Sprintf("(%d, %d)", p.x, p.y)
+}
+
+func learnInterfaces() {
+    // 花括号用来定义结构体变量，:=在这里将一个结构体变量赋值给p。
+    p := pair{3, 4}
+    fmt.Println(p.String()) // 调用pair类型p的String方法 
+    var i Stringer          // 声明i为Stringer接口类型 
+    i = p                   // 有效！因为p实现了Stringer接口（类似java中的塑型） 
+    // 调用i的String方法，输出和上面一样
+    fmt.Println(i.String())
+
+    // fmt包中的Println函数向对象要它们的string输出，实现了String方法就可以这样使用了。
+    // （类似java中的序列化）
+    fmt.Println(p) // 输出和上面一样，自动调用String函数。
+    fmt.Println(i) // 输出和上面一样。
+
+    learnErrorHandling()
+}
+
+func learnErrorHandling() {
+    // ", ok"用来判断有没有正常工作 
+    m := map[int]string{3: "three", 4: "four"}
+    if x, ok := m[1]; !ok { // ok 为false，因为m中没有1
+        fmt.Println("no one there")
+    } else {
+        fmt.Print(x) // 如果x在map中的话，x就是那个值喽。
+    }
+    // 错误可不只是ok，它还可以给出关于问题的更多细节。
+    if _, err := strconv.Atoi("non-int"); err != nil { // _ discards value
+        // 输出"strconv.ParseInt: parsing "non-int": invalid syntax"
+        fmt.Println(err)
+    }
+    // 待会再说接口吧。同时，
+    learnConcurrency()
+}
+
+// c是channel类型，一个并发安全的通信对象。
+func inc(i int, c chan int) {
+    c <- i + 1 // <-把右边的发送到左边的channel。
+}
+
+// 我们将用inc函数来并发地增加一些数字。
+func learnConcurrency() {
+    // 用make来声明一个slice，make会分配和初始化slice，map和channel。
+    c := make(chan int)
+    // 用go关键字开始三个并发的goroutine，如果机器支持的话，还可能是并行执行。
+    // 三个都被发送到同一个channel。
+    go inc(0, c) // go is a statement that starts a new goroutine.
+    go inc(10, c)
+    go inc(-805, c)
+    // 从channel中独处结果并打印。
+    // 打印出什么东西是不可预知的。
+    fmt.Println(<-c, <-c, <-c) // channel在右边的时候，<-是接收操作。
+
+    cs := make(chan string)       // 操作string的channel
+    cc := make(chan chan string)  // 操作channel的channel
+    go func() { c <- 84 }()       // 开始一个goroutine来发送一个新的数字 
+    go func() { cs <- "wordy" }() // 发送给cs
+    // Select类似于switch，但是每个case包括一个channel操作。
+    // 它随机选择一个准备好通讯的case。
+    select {
+    case i := <-c: // 从channel接收的值可以赋给其他变量
+        fmt.Println("it's a", i)
+    case <-cs: // 或者直接丢弃
+        fmt.Println("it's a string")
+    case <-cc: // 空的，还没作好通讯的准备 
+        fmt.Println("didn't happen.")
+    }
+    // 上面c或者cs的值被取到，其中一个goroutine结束，另外一个保持阻塞。
+
+    learnWebProgramming() // Go很适合web编程，我知道你也想学！
+}
+
+// http包中的一个简单的函数就可以开启web服务器。
+func learnWebProgramming() {
+    // ListenAndServe第一个参数指定了监听端口，第二个参数是一个接口，特定是http.Handler。
+    err := http.ListenAndServe(":8080", pair{})
+    fmt.Println(err) // 不要无视错误。
+}
+
+// 使pair实现http.Handler接口的ServeHTTP方法。
+func (p pair) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+    // 使用http.ResponseWriter返回数据
+    w.Write([]byte("You learned Go in Y minutes!"))
+}
+```
+
+## 更进一步
+
+Go的根源在[Go官方网站](http://golang.org/)。
+在那里你可以学习入门教程，通过浏览器交互式地学习，而且可以读到很多东西。
+
+强烈推荐阅读语言定义部分，很简单而且很简洁！(as language definitions go these days.)
+
+学习Go还要阅读Go标准库的源代码，全部文档化了，可读性非常好，可以学到go，go style和go idioms。在文档中点击函数名，源代码就出来了！
diff --git a/zh-cn/python-cn.html.markdown b/zh-cn/python-cn.html.markdown
index 764eed54..51efaac3 100755
--- a/zh-cn/python-cn.html.markdown
+++ b/zh-cn/python-cn.html.markdown
@@ -17,6 +17,7 @@ Python 由 Guido Van Rossum 在90年代初创建。 它现在是最流行的语�
 如果是Python 3，请在网络上寻找其他教程
 
 ```python
+
 # 单行注释
 """ 多行字符串可以用
     三个引号包裹，不过这也可以被当做
@@ -28,84 +29,84 @@ Python 由 Guido Van Rossum 在90年代初创建。 它现在是最流行的语�
 ####################################################
 
 # 数字类型
-3 #=> 3
+3  # => 3
 
 # 简单的算数
-1 + 1 #=> 2
-8 - 1 #=> 7
-10 * 2 #=> 20
-35 / 5 #=> 7
+1 + 1  # => 2
+8 - 1  # => 7
+10 * 2  # => 20
+35 / 5  # => 7
 
 # 整数的除法会自动取整
-5 / 2 #=> 2
+5 / 2  # => 2
 
 # 要做精确的除法，我们需要引入浮点数
 2.0     # 浮点数
-11.0 / 4.0 #=> 2.75 好多了
+11.0 / 4.0  # => 2.75 精确多了
 
 # 括号具有最高优先级
-(1 + 3) * 2 #=> 8
+(1 + 3) * 2  # => 8
 
-# 布尔值也是原始数据类型
+# 布尔值也是基本的数据类型
 True
 False
 
-# 用not来取非
-not True #=> False
-not False #=> True
+# 用 not 来取非
+not True  # => False
+not False  # => True
 
 # 相等
-1 == 1 #=> True
-2 == 1 #=> False
+1 == 1  # => True
+2 == 1  # => False
 
 # 不等
-1 != 1 #=> False
-2 != 1 #=> True
+1 != 1  # => False
+2 != 1  # => True
 
 # 更多的比较操作符
-1 < 10 #=> True
-1 > 10 #=> False
-2 <= 2 #=> True
-2 >= 2 #=> True
+1 < 10  # => True
+1 > 10  # => False
+2 <= 2  # => True
+2 >= 2  # => True
 
 # 比较运算可以连起来写！
-1 < 2 < 3 #=> True
-2 < 3 < 2 #=> False
+1 < 2 < 3  # => True
+2 < 3 < 2  # => False
 
-# 字符串通过"或'括起来
+# 字符串通过 " 或 ' 括起来
 "This is a string."
 'This is also a string.'
 
 # 字符串通过加号拼接
-"Hello " + "world!" #=> "Hello world!"
+"Hello " + "world!"  # => "Hello world!"
 
 # 字符串可以被视为字符的列表
-"This is a string"[0] #=> 'T'
+"This is a string"[0]  # => 'T'
 
 # % 可以用来格式化字符串
 "%s can be %s" % ("strings", "interpolated")
 
-# 也可以用format方法来格式化字符串
+# 也可以用 format 方法来格式化字符串
 # 推荐使用这个方法
 "{0} can be {1}".format("strings", "formatted")
 # 也可以用变量名代替数字
 "{name} wants to eat {food}".format(name="Bob", food="lasagna")
 
 # None 是对象
-None #=> None
+None  # => None
 
 # 不要用相等 `==` 符号来和None进行比较
-# 要用 `is` 
-"etc" is None #=> False
-None is None  #=> True
+# 要用 `is`
+"etc" is None  # => False
+None is None  # => True
 
 # 'is' 可以用来比较对象的相等性
 # 这个操作符在比较原始数据时没多少用，但是比较对象时必不可少
 
-# None, 0, 和空字符串都被算作False
-# 其他的均为True
-0 == False  #=> True
-"" == False #=> True
+# None, 0, 和空字符串都被算作 False
+# 其他的均为 True
+0 == False  # => True
+"" == False  # => True
 
 
 ####################################################
@@ -116,16 +117,16 @@ None is None  #=> True
 print "I'm Python. Nice to meet you!"
 
 
-# 给变量赋值前不需要事先生命
-some_var = 5    # 规范用小写字母和下划线来做为变量名
-some_var #=> 5
+# 给变量赋值前不需要事先声明
+some_var = 5    # 一般建议使用小写字母和下划线组合来做为变量名
+some_var  # => 5
 
-# 访问之前为赋值的变量会抛出异常
-# 查看控制流程一节来了解异常处理
-some_other_var  # 抛出命名异常
+# 访问未赋值的变量会抛出异常
+# 可以查看控制流程一节来了解如何异常处理
+some_other_var  # 抛出 NameError
 
-# if语句可以作为表达式来使用
-"yahoo!" if 3 > 2 else 2 #=> "yahoo!"
+# if 语句可以作为表达式来使用
+"yahoo!" if 3 > 2 else 2  # => "yahoo!"
 
 # 列表用来保存序列
 li = []
@@ -133,64 +134,64 @@ li = []
 other_li = [4, 5, 6]
 
 # 在列表末尾添加元素
-li.append(1)    #li 现在是 [1]
-li.append(2)    #li 现在是 [1, 2]
-li.append(4)    #li 现在是 [1, 2, 4]
-li.append(3)    #li 现在是 [1, 2, 4, 3]
+li.append(1)    # li 现在是 [1]
+li.append(2)    # li 现在是 [1, 2]
+li.append(4)    # li 现在是 [1, 2, 4]
+li.append(3)    # li 现在是 [1, 2, 4, 3]
 # 移除列表末尾元素
-li.pop()        #=> 3 and li is now [1, 2, 4]
-# 放回来
+li.pop()        # => 3 li 现在是 [1, 2, 4]
+# 重新加进去
 li.append(3)    # li is now [1, 2, 4, 3] again.
 
 # 像其他语言访问数组一样访问列表
-li[0] #=> 1
+li[0]  # => 1
 # 访问最后一个元素
-li[-1] #=> 3
+li[-1]  # => 3
 
 # 越界会抛出异常
-li[4] # 抛出越界异常
+li[4]  # 抛出越界异常
 
 # 切片语法需要用到列表的索引访问
 # 可以看做数学之中左闭右开区间
-li[1:3] #=> [2, 4]
+li[1:3]  # => [2, 4]
 # 省略开头的元素
-li[2:] #=> [4, 3]
+li[2:]  # => [4, 3]
 # 省略末尾的元素
-li[:3] #=> [1, 2, 4]
+li[:3]  # => [1, 2, 4]
 
 # 删除特定元素
-del li[2] # li 现在是 [1, 2, 3]
+del li[2]  # li 现在是 [1, 2, 3]
 
 # 合并列表
-li + other_li #=> [1, 2, 3, 4, 5, 6] - 不改变这两个列表
+li + other_li  # => [1, 2, 3, 4, 5, 6] - 并不会不改变这两个列表
 
-# 通过拼接合并列表
-li.extend(other_li) # li 是 [1, 2, 3, 4, 5, 6]
+# 通过拼接来合并列表
+li.extend(other_li)  # li 是 [1, 2, 3, 4, 5, 6]
 
-# 用in来返回元素是否在列表中
-1 in li #=> True
+# 用 in 来返回元素是否在列表中
+1 in li  # => True
 
 # 返回列表长度
-len(li) #=> 6
+len(li)  # => 6
 
 
-# 元组类似于列表，但是他是不可改变的
+# 元组类似于列表，但它是不可改变的
 tup = (1, 2, 3)
-tup[0] #=> 1
+tup[0]  # => 1
 tup[0] = 3  # 类型错误
 
 # 对于大多数的列表操作，也适用于元组
-len(tup) #=> 3
-tup + (4, 5, 6) #=> (1, 2, 3, 4, 5, 6)
-tup[:2] #=> (1, 2)
-2 in tup #=> True
+len(tup)  # => 3
+tup + (4, 5, 6)  # => (1, 2, 3, 4, 5, 6)
+tup[:2]  # => (1, 2)
+2 in tup  # => True
 
 # 你可以将元组解包赋给多个变量
-a, b, c = (1, 2, 3)     # a是1，b是2，c是3
-# 如果不加括号，那么会自动视为元组
+a, b, c = (1, 2, 3)     # a 是 1，b 是 2，c 是 3
+# 如果不加括号，将会被自动视为元组
 d, e, f = 4, 5, 6
 # 现在我们可以看看交换两个数字是多么容易的事
-e, d = d, e     # d是5，e是4
+e, d = d, e     # d 是 5，e 是 4
 
 
 # 字典用来储存映射关系
@@ -199,59 +200,59 @@ empty_dict = {}
 filled_dict = {"one": 1, "two": 2, "three": 3}
 
 # 字典也用中括号访问元素
-filled_dict["one"] #=> 1
+filled_dict["one"]  # => 1
 
 # 把所有的键保存在列表中
-filled_dict.keys() #=> ["three", "two", "one"]
+filled_dict.keys()  # => ["three", "two", "one"]
 # 键的顺序并不是唯一的，得到的不一定是这个顺序
 
 # 把所有的值保存在列表中
-filled_dict.values() #=> [3, 2, 1]
+filled_dict.values()  # => [3, 2, 1]
 # 和键的顺序相同
 
 # 判断一个键是否存在
-"one" in filled_dict #=> True
-1 in filled_dict #=> False
+"one" in filled_dict  # => True
+1 in filled_dict  # => False
 
-# 查询一个不存在的键会抛出键异常
-filled_dict["four"] # 键异常
+# 查询一个不存在的键会抛出 KeyError
+filled_dict["four"]  # KeyError
 
-# 用get方法来避免键异常
-filled_dict.get("one") #=> 1
-filled_dict.get("four") #=> None
-# get方法支持在不存在的时候返回一个默认值
-filled_dict.get("one", 4) #=> 1
-filled_dict.get("four", 4) #=> 4
+# 用 get 方法来避免 KeyError
+filled_dict.get("one")  # => 1
+filled_dict.get("four")  # => None
+# get 方法支持在不存在的时候返回一个默认值
+filled_dict.get("one", 4)  # => 1
+filled_dict.get("four", 4)  # => 4
 
-# Setdefault是一个更安全的添加字典元素的方法
-filled_dict.setdefault("five", 5) #filled_dict["five"] 的值为 5
-filled_dict.setdefault("five", 6) #filled_dict["five"] 的值仍然是 5
+# setdefault 是一个更安全的添加字典元素的方法
+filled_dict.setdefault("five", 5)  # filled_dict["five"] 的值为 5
+filled_dict.setdefault("five", 6)  # filled_dict["five"] 的值仍然是 5
 
 
 # 集合储存无顺序的元素
 empty_set = set()
-# 出事话一个集合
-some_set = set([1,2,2,3,4]) # filled_set 现在是 set([1, 2, 3, 4])
+# 初始化一个集合
+some_set = set([1, 2, 2, 3, 4])  # filled_set 现在是 set([1, 2, 3, 4])
 
 # Python 2.7 之后，大括号可以用来表示集合
-filled_set = {1, 2, 2, 3, 4} # => {1 2 3 4}
+filled_set = {1, 2, 2, 3, 4}  # => {1 2 3 4}
 
-# 为集合添加元素
-filled_set.add(5) # filled_set 现在是 {1, 2, 3, 4, 5}
+# 向集合添加元素
+filled_set.add(5)  # filled_set 现在是 {1, 2, 3, 4, 5}
 
-# 用&来实现集合的交
+# 用 & 来计算集合的交
 other_set = {3, 4, 5, 6}
-filled_set & other_set #=> {3, 4, 5}
+filled_set & other_set  # => {3, 4, 5}
 
-# 用|来实现集合的并
-filled_set | other_set #=> {1, 2, 3, 4, 5, 6}
+# 用 | 来计算集合的并
+filled_set | other_set  # => {1, 2, 3, 4, 5, 6}
 
-# 用-来实现集合的差
-{1,2,3,4} - {2,3,5} #=> {1, 4}
+# 用 - 来计算集合的差
+{1, 2, 3, 4} - {2, 3, 5}  # => {1, 4}
 
-# 用in来判断元素是否存在于集合中
-2 in filled_set #=> True
-10 in filled_set #=> False
+# 用 in 来判断元素是否存在于集合中
+2 in filled_set  # => True
+10 in filled_set  # => False
 
 
 ####################################################
@@ -261,13 +262,13 @@ filled_set | other_set #=> {1, 2, 3, 4, 5, 6}
 # 新建一个变量
 some_var = 5
 
-# 这是个if语句，在python中缩进是很重要的。
-# 会输出 "some var is smaller than 10"
+# 这是个 if 语句，在 python 中缩进是很重要的。
+# 下面的代码片段将会输出 "some var is smaller than 10"
 if some_var > 10:
     print "some_var is totally bigger than 10."
 elif some_var < 10:    # 这个 elif 语句是不必须的
     print "some_var is smaller than 10."
-else:           # 也不是必须的
+else:           # 这个 else 也不是必须的
     print "some_var is indeed 10."
 
 
@@ -281,7 +282,7 @@ else:           # 也不是必须的
 for animal in ["dog", "cat", "mouse"]:
     # 你可以用 % 来格式化字符串
     print "%s is a mammal" % animal
-    
+
 """
 `range(number)` 返回从0到给定数字的列表
 输出:
@@ -294,7 +295,7 @@ for i in range(4):
     print i
 
 """
-While循环
+while 循环
 输出:
     0
     1
@@ -304,29 +305,29 @@ While循环
 x = 0
 while x < 4:
     print x
-    x += 1  # Shorthand for x = x + 1
+    x += 1  #  x = x + 1 的简写
 
-# 用 try/except块来处理异常
+# 用 try/except 块来处理异常
 
 # Python 2.6 及以上适用:
 try:
-    # 用raise来抛出异常
+    # 用 raise 来抛出异常
     raise IndexError("This is an index error")
 except IndexError as e:
-    pass    # Pass就是什么都不做，不过通常这里会做一些恢复工作
+    pass    # pass 就是什么都不做，不过通常这里会做一些恢复工作
 
 
 ####################################################
 ## 4. 函数
 ####################################################
 
-# 用def来新建函数
+# 用 def 来新建函数
 def add(x, y):
     print "x is %s and y is %s" % (x, y)
-    return x + y    # Return values with a return statement
+    return x + y    # 通过 return 来返回值
 
 # 调用带参数的函数
-add(5, 6) #=> 输出 "x is 5 and y is 6" 返回 11
+add(5, 6)  # => 输出 "x is 5 and y is 6" 返回 11
 
 # 通过关键字赋值来调用函数
 add(y=6, x=5)   # 顺序是无所谓的
@@ -335,7 +336,7 @@ add(y=6, x=5)   # 顺序是无所谓的
 def varargs(*args):
     return args
 
-varargs(1, 2, 3) #=> (1,2,3)
+varargs(1, 2, 3)  # => (1,2,3)
 
 
 # 我们也可以定义接受多个变量的函数，这些变量是按照关键字排列的
@@ -343,7 +344,7 @@ def keyword_args(**kwargs):
     return kwargs
 
 # 实际效果：
-keyword_args(big="foot", loch="ness") #=> {"big": "foot", "loch": "ness"}
+keyword_args(big="foot", loch="ness")  # => {"big": "foot", "loch": "ness"}
 
 # 你也可以同时将一个函数定义成两种形式
 def all_the_args(*args, **kwargs):
@@ -355,38 +356,38 @@ all_the_args(1, 2, a=3, b=4) prints:
     {"a": 3, "b": 4}
 """
 
-# 当调用函数的时候，我们也可以和之前所做的相反，把元组和字典展开为参数
+# 当调用函数的时候，我们也可以进行相反的操作，把元组和字典展开为参数
 args = (1, 2, 3, 4)
 kwargs = {"a": 3, "b": 4}
-all_the_args(*args) # equivalent to foo(1, 2, 3, 4)
-all_the_args(**kwargs) # equivalent to foo(a=3, b=4)
-all_the_args(*args, **kwargs) # equivalent to foo(1, 2, 3, 4, a=3, b=4)
+all_the_args(*args)  # 等价于 foo(1, 2, 3, 4)
+all_the_args(**kwargs)  # 等价于 foo(a=3, b=4)
+all_the_args(*args, **kwargs)  # 等价于 foo(1, 2, 3, 4, a=3, b=4)
 
-# Python 有一等函数：
+# 函数在 python 中是一等公民
 def create_adder(x):
     def adder(y):
         return x + y
     return adder
 
 add_10 = create_adder(10)
-add_10(3) #=> 13
+add_10(3)  # => 13
 
 # 匿名函数
-(lambda x: x > 2)(3) #=> True
+(lambda x: x > 2)(3)  # => True
 
 # 内置高阶函数
-map(add_10, [1,2,3]) #=> [11, 12, 13]
-filter(lambda x: x > 5, [3, 4, 5, 6, 7]) #=> [6, 7]
+map(add_10, [1, 2, 3])  # => [11, 12, 13]
+filter(lambda x: x > 5, [3, 4, 5, 6, 7])  # => [6, 7]
 
 # 可以用列表方法来对高阶函数进行更巧妙的引用
-[add_10(i) for i in [1, 2, 3]]  #=> [11, 12, 13]
-[x for x in [3, 4, 5, 6, 7] if x > 5] #=> [6, 7]
+[add_10(i) for i in [1, 2, 3]]  # => [11, 12, 13]
+[x for x in [3, 4, 5, 6, 7] if x > 5]  # => [6, 7]
 
 ####################################################
 ## 5. 类
 ####################################################
 
-# 我们新建的类是从object类中继承的
+# 我们新建的类是从 object 类中继承的
 class Human(object):
 
      # 类属性，由所有类的对象共享
@@ -397,9 +398,9 @@ class Human(object):
         # 将参数赋给对象成员属性
         self.name = name
 
-    # 成员方法，参数要有self
+    # 成员方法，参数要有 self
     def say(self, msg):
-       return "%s: %s" % (self.name, msg)
+        return "%s: %s" % (self.name, msg)
 
     # 类方法由所有类的对象共享
     # 这类方法在调用时，会把类本身传给第一个参数
@@ -421,15 +422,15 @@ j = Human("Joel")
 print j.say("hello")  # 输出 "Joel: hello"
 
 # 访问类的方法
-i.get_species() #=> "H. sapiens"
+i.get_species()  # => "H. sapiens"
 
 # 改变共享属性
 Human.species = "H. neanderthalensis"
-i.get_species() #=> "H. neanderthalensis"
-j.get_species() #=> "H. neanderthalensis"
+i.get_species()  # => "H. neanderthalensis"
+j.get_species()  # => "H. neanderthalensis"
 
 # 访问静态变量
-Human.grunt() #=> "*grunt*"
+Human.grunt()  # => "*grunt*"
 
 
 ####################################################
@@ -438,12 +439,12 @@ Human.grunt() #=> "*grunt*"
 
 # 我们可以导入其他模块
 import math
-print math.sqrt(16) #=> 4
+print math.sqrt(16)  # => 4
 
-# 我们也可以从一个模块中特定的函数
+# 我们也可以从一个模块中导入特定的函数
 from math import ceil, floor
-print ceil(3.7)  #=> 4.0
-print floor(3.7) #=> 3.0
+print ceil(3.7)   # => 4.0
+print floor(3.7)  # => 3.0
 
 # 从模块中导入所有的函数
 # 警告：不推荐使用
@@ -451,13 +452,13 @@ from math import *
 
 # 简写模块名
 import math as m
-math.sqrt(16) == m.sqrt(16) #=> True
+math.sqrt(16) == m.sqrt(16)  # => True
 
 # Python的模块其实只是普通的python文件
 # 你也可以创建自己的模块，并且导入它们
 # 模块的名字就和文件的名字相同
 
-# 以可以通过下面的信息找找要成为模块需要什么属性或方法
+# 也可以通过下面的方法查看模块中有什么属性和方法
 import math
 dir(math)
 
diff --git a/zh-cn/racket-cn.html.markdown b/zh-cn/racket-cn.html.markdown
new file mode 100644
index 00000000..d43511ea
--- /dev/null
+++ b/zh-cn/racket-cn.html.markdown
@@ -0,0 +1,608 @@
+---
+
+language: racket
+lang: zh-cn
+filename: learnracket.rkt
+contributors:
+  - ["th3rac25", "https://github.com/voila"]
+  - ["Eli Barzilay", "https://github.com/elibarzilay"]
+  - ["Gustavo Schmidt", "https://github.com/gustavoschmidt"]
+translators:
+    - ["lyuehh", "https://github.com/lyuehh"]
+---
+
+Racket是Lisp/Scheme家族中的一个通用的，多范式的编程语言。
+非常期待您的反馈！你可以通过[@th3rac25](http://twitter.com/th3rac25)或以用户名为 th3rac25 的Google邮箱服务和我取得联系
+
+```racket
+#lang racket ; 声明我们使用的语言
+
+;;; 注释
+
+;; 单行注释以分号开始
+
+#| 块注释
+   可以横跨很多行而且...
+    #|
+       可以嵌套
+    |#
+|#
+
+;; S表达式注释忽略剩下的表达式
+;; 在调试的时候会非常有用
+#; (被忽略的表达式)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 1. 原始数据类型和操作符
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; 数字
+9999999999999999999999 ; 整数
+#b111                  ; 二进制数字 => 7
+#o111                  ; 八进制数字 => 73
+#x111                  ; 十六进制数字 => 273
+3.14                   ; 实数
+6.02e+23
+1/2                    ; 有理数
+1+2i                   ; 复数
+
+;; 函数调用写作(f x y z ...)
+;; 在这里 f 是一个函数， x, y, z, ... 是参数
+;; 如果你想创建一个列表数据的字面量, 使用 ' 来阻止它们
+;; 被求值
+'(+ 1 2) ; => (+ 1 2)
+;; 接下来，是一些数学运算
+(+ 1 1)  ; => 2
+(- 8 1)  ; => 7
+(* 10 2) ; => 20
+(expt 2 3) ; => 8
+(quotient 5 2) ; => 2
+(remainder 5 2) ; => 1
+(/ 35 5) ; => 7
+(/ 1 3) ; => 1/3
+(exact->inexact 1/3) ; => 0.3333333333333333
+(+ 1+2i  2-3i) ; => 3-1i
+
+;;; 布尔类型
+#t ; 为真
+#f ; 为假，#f 之外的任何值都是真
+(not #t) ; => #f
+(and 0 #f (error "doesn't get here")) ; => #f
+(or #f 0 (error "doesn't get here"))  ; => 0
+
+;;; 字符
+#\A ; => #\A
+#\λ ; => #\λ
+#\u03BB ; => #\λ
+
+;;; 字符串是字符组成的定长数组
+"Hello, world!"
+"Benjamin \"Bugsy\" Siegel"   ; \是转义字符
+"Foo\tbar\41\x21\u0021\a\r\n" ; 包含C语言的转义字符，和Unicode
+"λx:(μα.α→α).xx"              ; 字符串可以包含Unicode字符
+
+;; 字符串可以相加
+(string-append "Hello " "world!") ; => "Hello world!"
+
+;; 一个字符串可以看做是一个包含字符的列表
+(string-ref "Apple" 0) ; => #\A
+
+;; format 可以用来格式化字符串
+(format "~a can be ~a" "strings" "formatted")
+
+;; 打印字符串非常简单
+(printf "I'm Racket. Nice to meet you!\n")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 2. 变量
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 你可以使用 define 定义一个变量
+;; 变量的名字可以使用任何字符除了: ()[]{}",'`;#|\
+(define some-var 5)
+some-var ; => 5
+
+;; 你也可以使用Unicode字符
+(define ⊆ subset?)
+(⊆ (set 3 2) (set 1 2 3)) ; => #t
+
+;; 访问未赋值的变量会引发一个异常
+; x ; => x: undefined ...
+
+;; 本地绑定: `me' 被绑定到 "Bob"，并且只在 let 中生效
+(let ([me "Bob"])
+  "Alice"
+  me) ; => "Bob"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 3. 结构和集合
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 结构体
+(struct dog (name breed age))
+(define my-pet
+  (dog "lassie" "collie" 5))
+my-pet ; => #<dog>
+(dog? my-pet) ; => #t
+(dog-name my-pet) ; => "lassie"
+
+;;; 对 (不可变的)
+;; `cons' 返回对, `car' 和 `cdr' 从对中提取第1个
+;; 和第2个元素
+(cons 1 2) ; => '(1 . 2)
+(car (cons 1 2)) ; => 1
+(cdr (cons 1 2)) ; => 2
+
+;;; 列表
+
+;; 列表由链表构成, 由 `cons' 的结果
+;; 和一个 `null' (或者 '()) 构成，后者标记了这个列表的结束
+(cons 1 (cons 2 (cons 3 null))) ; => '(1 2 3)
+;; `list' 给列表提供了一个非常方便的可变参数的生成器
+(list 1 2 3) ; => '(1 2 3)
+;; 一个单引号也可以用来表示一个列表字面量
+'(1 2 3) ; => '(1 2 3)
+
+;; 仍然可以使用 `cons' 在列表的开始处添加一项
+(cons 4 '(1 2 3)) ; => '(4 1 2 3)
+
+;; `append' 函数可以将两个列表合并
+(append '(1 2) '(3 4)) ; => '(1 2 3 4)
+
+;; 列表是非常基础的类型，所以有*很多*操作列表的方法
+;; 下面是一些例子:
+(map add1 '(1 2 3))          ; => '(2 3 4)
+(map + '(1 2 3) '(10 20 30)) ; => '(11 22 33)
+(filter even? '(1 2 3 4))    ; => '(2 4)
+(count even? '(1 2 3 4))     ; => 2
+(take '(1 2 3 4) 2)          ; => '(1 2)
+(drop '(1 2 3 4) 2)          ; => '(3 4)
+
+;;; 向量
+
+;; 向量是定长的数组
+#(1 2 3) ; => '#(1 2 3)
+
+;; 使用 `vector-append' 方法将2个向量合并
+(vector-append #(1 2 3) #(4 5 6)) ; => #(1 2 3 4 5 6)
+
+;;; Set(翻译成集合也不太合适，所以不翻译了..)
+
+;; 从一个列表创建一个Set
+(list->set '(1 2 3 1 2 3 3 2 1 3 2 1)) ; => (set 1 2 3)
+
+;; 使用 `set-add' 增加一个成员
+;; (函数式特性: 这里会返回一个扩展后的Set，而不是修改输入的值)
+(set-add (set 1 2 3) 4) ; => (set 1 2 3 4)
+
+;; 使用 `set-remove' 移除一个成员
+(set-remove (set 1 2 3) 1) ; => (set 2 3)
+
+;; 使用 `set-member?' 测试成员是否存在
+(set-member? (set 1 2 3) 1) ; => #t
+(set-member? (set 1 2 3) 4) ; => #f
+
+;;; 散列表
+
+;; 创建一个不变的散列表 (可变散列表的例子在下面)
+(define m (hash 'a 1 'b 2 'c 3))
+
+;; 根据键取得值
+(hash-ref m 'a) ; => 1
+
+;; 获取一个不存在的键是一个异常
+; (hash-ref m 'd) => 没有找到元素
+
+;; 你可以给不存在的键提供一个默认值
+(hash-ref m 'd 0) ; => 0
+
+;; 使用 `hash-set' 来扩展一个不可变的散列表
+;; (返回的是扩展后的散列表而不是修改它)
+(define m2 (hash-set m 'd 4))
+m2 ; => '#hash((b . 2) (a . 1) (d . 4) (c . 3))
+
+;; 记住，使用 `hash` 创建的散列表是不可变的
+m ; => '#hash((b . 2) (a . 1) (c . 3))  <-- no `d'
+
+;; 使用 `hash-remove' 移除一个键值对 (函数式特性，m并不变)
+(hash-remove m 'a) ; => '#hash((b . 2) (c . 3))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 3. 函数
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 使用 `lambda' 创建函数
+;; 函数总是返回它最后一个表达式的值
+(lambda () "Hello World") ; => #<procedure>
+;; 也可以使用 Unicode 字符 `λ'
+(λ () "Hello World")     ; => 同样的函数
+
+;; 使用括号调用一个函数，也可以直接调用一个 lambda 表达式
+((lambda () "Hello World")) ; => "Hello World"
+((λ () "Hello World"))      ; => "Hello World"
+
+;; 将函数赋值为一个变量
+(define hello-world (lambda () "Hello World"))
+(hello-world) ; => "Hello World"
+
+;; 你可以使用函数定义的语法糖来简化代码
+(define (hello-world2) "Hello World")
+
+;; `()`是函数的参数列表
+(define hello
+  (lambda (name)
+    (string-append "Hello " name)))
+(hello "Steve") ; => "Hello Steve"
+;; 同样的，可以使用语法糖来定义:
+(define (hello2 name)
+  (string-append "Hello " name))
+
+;; 你也可以使用可变参数， `case-lambda'
+(define hello3
+  (case-lambda
+    [() "Hello World"]
+    [(name) (string-append "Hello " name)]))
+(hello3 "Jake") ; => "Hello Jake"
+(hello3) ; => "Hello World"
+;; ... 或者给参数指定一个可选的默认值
+(define (hello4 [name "World"])
+  (string-append "Hello " name))
+
+;; 函数可以将多余的参数放到一个列表里
+(define (count-args . args)
+  (format "You passed ~a args: ~a" (length args) args))
+(count-args 1 2 3) ; => "You passed 3 args: (1 2 3)"
+;; ... 也可以使用不带语法糖的 `lambda' 形式:
+(define count-args2
+  (lambda args
+    (format "You passed ~a args: ~a" (length args) args)))
+
+;; 你可以混用两种用法
+(define (hello-count name . args)
+  (format "Hello ~a, you passed ~a extra args" name (length args)))
+(hello-count "Finn" 1 2 3)
+; => "Hello Finn, you passed 3 extra args"
+;; ... 不带语法糖的形式:
+(define hello-count2
+  (lambda (name . args)
+    (format "Hello ~a, you passed ~a extra args" name (length args))))
+
+;; 使用关键字
+(define (hello-k #:name [name "World"] #:greeting [g "Hello"] . args)
+  (format "~a ~a, ~a extra args" g name (length args)))
+(hello-k)                 ; => "Hello World, 0 extra args"
+(hello-k 1 2 3)           ; => "Hello World, 3 extra args"
+(hello-k #:greeting "Hi") ; => "Hi World, 0 extra args"
+(hello-k #:name "Finn" #:greeting "Hey") ; => "Hey Finn, 0 extra args"
+(hello-k 1 2 3 #:greeting "Hi" #:name "Finn" 4 5 6)
+                                         ; => "Hi Finn, 6 extra args"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 4. 判断是否相等
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 判断数字使用 `='
+(= 3 3.0) ; => #t
+(= 2 1) ; => #f
+
+;; 判断对象使用 `eq?'
+(eq? 3 3) ; => #t
+(eq? 3 3.0) ; => #f
+(eq? (list 3) (list 3)) ; => #f
+
+;; 判断集合使用 `equal?'
+(equal? (list 'a 'b) (list 'a 'b)) ; => #t
+(equal? (list 'a 'b) (list 'b 'a)) ; => #f
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 5. 控制结构
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; 条件判断
+
+(if #t               ; 测试表达式
+    "this is true"   ; 为真的表达式
+    "this is false") ; 为假的表达式
+; => "this is true"
+
+;; 注意, 除 `#f` 之外的所有值都认为是真
+(member 'Groucho '(Harpo Groucho Zeppo)) ; => '(Groucho Zeppo)
+(if (member 'Groucho '(Harpo Groucho Zeppo))
+    'yep
+    'nope)
+; => 'yep
+
+;; `cond' 会进行一系列的判断来选择一个结果
+(cond [(> 2 2) (error "wrong!")]
+      [(< 2 2) (error "wrong again!")]
+      [else 'ok]) ; => 'ok
+
+;;; 模式匹配
+
+(define (fizzbuzz? n)
+  (match (list (remainder n 3) (remainder n 5))
+    [(list 0 0) 'fizzbuzz]
+    [(list 0 _) 'fizz]
+    [(list _ 0) 'buzz]
+    [_          #f]))
+
+(fizzbuzz? 15) ; => 'fizzbuzz
+(fizzbuzz? 37) ; => #f
+
+;;; 循环
+
+;; 循环可以使用递归(尾递归)
+(define (loop i)
+  (when (< i 10)
+    (printf "i=~a\n" i)
+    (loop (add1 i))))
+(loop 5) ; => i=5, i=6, ...
+
+;; 类似的，可以使用 `let` 定义
+(let loop ((i 0))
+  (when (< i 10)
+    (printf "i=~a\n" i)
+    (loop (add1 i)))) ; => i=0, i=1, ...
+
+;; 看上面的例子怎么增加一个新的 `loop' 形式, 但是 Racket 已经有了一个非常
+;; 灵活的 `for' 了:
+(for ([i 10])
+  (printf "i=~a\n" i)) ; => i=0, i=1, ...
+(for ([i (in-range 5 10)])
+  (printf "i=~a\n" i)) ; => i=5, i=6, ...
+
+;;; 其他形式的迭代
+;; `for' 允许在很多数据结构中迭代:
+;; 列表, 向量, 字符串, Set, 散列表, 等...
+
+(for ([i (in-list '(l i s t))])
+  (displayln i))
+
+(for ([i (in-vector #(v e c t o r))])
+  (displayln i))
+
+(for ([i (in-string "string")])
+  (displayln i))
+
+(for ([i (in-set (set 'x 'y 'z))])
+  (displayln i))
+
+(for ([(k v) (in-hash (hash 'a 1 'b 2 'c 3 ))])
+  (printf "key:~a value:~a\n" k v))
+
+;;; 更多复杂的迭代
+
+;; 并行扫描多个序列 (遇到长度小的就停止)
+(for ([i 10] [j '(x y z)]) (printf "~a:~a\n" i j))
+; => 0:x 1:y 2:z
+
+;; 嵌套循环
+(for* ([i 2] [j '(x y z)]) (printf "~a:~a\n" i j))
+; => 0:x, 0:y, 0:z, 1:x, 1:y, 1:z
+
+;; 带有条件判断的 `for`
+(for ([i 1000]
+      #:when (> i 5)
+      #:unless (odd? i)
+      #:break (> i 10))
+  (printf "i=~a\n" i))
+; => i=6, i=8, i=10
+
+;;; 更多的例子帮助你加深理解..
+;; 和 `for' 循环非常像 -- 收集结果
+
+(for/list ([i '(1 2 3)])
+  (add1 i)) ; => '(2 3 4)
+
+(for/list ([i '(1 2 3)] #:when (even? i))
+  i) ; => '(2)
+
+(for/list ([i 10] [j '(x y z)])
+  (list i j)) ; => '((0 x) (1 y) (2 z))
+
+(for/list ([i 1000] #:when (> i 5) #:unless (odd? i) #:break (> i 10))
+  i) ; => '(6 8 10)
+
+(for/hash ([i '(1 2 3)])
+  (values i (number->string i)))
+; => '#hash((1 . "1") (2 . "2") (3 . "3"))
+
+;; 也有很多其他的内置方法来收集循环中的值:
+(for/sum ([i 10]) (* i i)) ; => 285
+(for/product ([i (in-range 1 11)]) (* i i)) ; => 13168189440000
+(for/and ([i 10] [j (in-range 10 20)]) (< i j)) ; => #t
+(for/or ([i 10] [j (in-range 0 20 2)]) (= i j)) ; => #t
+;; 如果需要合并计算结果, 使用 `for/fold'
+(for/fold ([sum 0]) ([i '(1 2 3 4)]) (+ sum i)) ; => 10
+;; (这个函数可以在大部分情况下替代普通的命令式循环)
+
+;;; 异常
+
+;; 要捕获一个异常，使用 `with-handlers' 形式
+(with-handlers ([exn:fail? (lambda (exn) 999)])
+  (+ 1 "2")) ; => 999
+(with-handlers ([exn:break? (lambda (exn) "no time")])
+  (sleep 3)
+  "phew") ; => "phew", 如果你打断了它，那么结果 => "no time"
+
+;; 使用 `raise' 抛出一个异常后者其他任何值
+(with-handlers ([number?    ; 捕获抛出的数字类型的值
+                 identity]) ; 将它们作为普通值
+  (+ 1 (raise 2))) ; => 2
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 6. 可变的值
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 使用 `set!' 给一个已经存在的变量赋一个新值
+(define n 5)
+(set! n (add1 n))
+n ; => 6
+
+;; 给那些明确地需要变化的值使用 `boxes` (在其他语言里类似指针
+;; 或者引用)
+(define n* (box 5))
+(set-box! n* (add1 (unbox n*)))
+(unbox n*) ; => 6
+
+;; 很多 Racket 诗句类型是不可变的 (对，列表，等)，有一些既是可变的
+;; 又是不可变的 (字符串，向量，散列表
+;; 等...)
+
+;; 使用 `vector' 或者 `make-vector' 创建一个可变的向量
+(define vec (vector 2 2 3 4))
+(define wall (make-vector 100 'bottle-of-beer))
+;; 使用 `vector-set!` 更新一项
+(vector-set! vec 0 1)
+(vector-set! wall 99 'down)
+vec ; => #(1 2 3 4)
+
+;; 创建一个空的可变散列表，然后操作它
+(define m3 (make-hash))
+(hash-set! m3 'a 1)
+(hash-set! m3 'b 2)
+(hash-set! m3 'c 3)
+(hash-ref m3 'a)   ; => 1
+(hash-ref m3 'd 0) ; => 0
+(hash-remove! m3 'a)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 7. 模块
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 模块让你将你的代码组织为多个文件，成为可重用的模块，
+;; 在这里，我们使用嵌套在本文的整个大模块
+;; 里的子模块(从 "#lang" 这一行开始)
+
+(module cake racket/base ; 基于 racket/base 定义一个 `cake` 模块
+
+  (provide print-cake) ; 这个模块导出的函数
+
+  (define (print-cake n)
+    (show "   ~a   " n #\.)
+    (show " .-~a-. " n #\|)
+    (show " | ~a | " n #\space)
+    (show "---~a---" n #\-))
+
+  (define (show fmt n ch) ; 内部函数
+    (printf fmt (make-string n ch))
+    (newline)))
+
+;; 使用 `require` 从模块中得到所有 `provide` 的函数
+(require 'cake) ; 这里的 `'`表示是本地的子模块
+(print-cake 3)
+; (show "~a" 1 #\A) ; => 报错, `show' 没有被导出，不存在
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 8. 类和对象
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 创建一个 fish% 类(%是给类绑定用的)
+(define fish%
+  (class object%
+    (init size) ; 初始化的参数
+    (super-new) ; 父类的初始化
+    ;; 域
+    (define current-size size)
+    ;; 公共方法
+    (define/public (get-size)
+      current-size)
+    (define/public (grow amt)
+      (set! current-size (+ amt current-size)))
+    (define/public (eat other-fish)
+      (grow (send other-fish get-size)))))
+
+;; 创建一个 fish% 类的示例
+(define charlie
+  (new fish% [size 10]))
+
+;; 使用 `send' 调用一个对象的方法
+(send charlie get-size) ; => 10
+(send charlie grow 6)
+(send charlie get-size) ; => 16
+
+;; `fish%' 是一个普通的值，我们可以用它来混入
+(define (add-color c%)
+  (class c%
+    (init color)
+    (super-new)
+    (define my-color color)
+    (define/public (get-color) my-color)))
+(define colored-fish% (add-color fish%))
+(define charlie2 (new colored-fish% [size 10] [color 'red]))
+(send charlie2 get-color)
+;; 或者，不带名字
+(send (new (add-color fish%) [size 10] [color 'red]) get-color)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 9. 宏
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 宏让你扩展这门语言的语法
+
+;; 让我们定义一个while循环
+(define-syntax-rule (while condition body ...)
+  (let loop ()
+    (when condition
+      body ...
+      (loop))))
+
+(let ([i 0])
+  (while (< i  10)
+    (displayln i)
+    (set! i (add1 i))))
+
+;; 宏是安全的，你不能修改现有的变量
+(define-syntax-rule (swap! x y) ; !表示会修改
+  (let ([tmp x])
+    (set! x y)
+    (set! y tmp)))
+
+(define tmp 2)
+(define other 3)
+(swap! tmp other)
+(printf "tmp = ~a; other = ~a\n" tmp other)
+;; 变量 `tmp` 被重命名为 `tmp_1`
+;; 避免名字冲突
+;; (let ([tmp_1 tmp])
+;;   (set! tmp other)
+;;   (set! other tmp_1))
+
+;; 但它们仍然会导致错误代码，比如:
+(define-syntax-rule (bad-while condition body ...)
+  (when condition
+    body ...
+    (bad-while condition body ...)))
+;; 这个宏会挂掉，它产生了一个无限循环，如果你试图去使用它
+;; 编译器会进入死循环
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; 10. 契约
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; 契约限制变量从模块中导入
+
+(module bank-account racket
+  (provide (contract-out
+            [deposit (-> positive? any)] ; 数量一直是正值
+            [balance (-> positive?)]))
+
+  (define amount 0)
+  (define (deposit a) (set! amount (+ amount a)))
+  (define (balance) amount)
+  )
+
+(require 'bank-account)
+(deposit 5)
+
+(balance) ; => 5
+
+;; 客户端尝试存储一个负值时会出错
+;; (deposit -5) ; => deposit: contract violation
+;; expected: positive?
+;; given: -5
+;; more details....
+```
+
+## 进一步阅读
+
+想知道更多吗？ 尝试 [Getting Started with Racket](http://docs.racket-lang.org/getting-started/)
diff --git a/zh-cn/ruby-cn.html.markdown b/zh-cn/ruby-cn.html.markdown
index 6530b520..619e6e92 100644
--- a/zh-cn/ruby-cn.html.markdown
+++ b/zh-cn/ruby-cn.html.markdown
@@ -94,7 +94,7 @@ x = y = 10 #=> 10
 x #=> 10
 y #=> 10
 
-# 按照惯例，用snake_case 作为变量名
+# 按照惯例，用 snake_case 作为变量名
 snake_case = true
 
 # 使用具有描述性的运算符
@@ -102,7 +102,8 @@ path_to_project_root = '/good/name/'
 path = '/bad/name/'
 
 # 符号（Symbols，也是对象)
-# 符号是不可变的，内部用整数类型表示的可重用的值。通常用它代替字符串来有效地表达有意义的值
+# 符号是不可变的，内部用整数类型表示的可重用的值。
+# 通常用它代替字符串来有效地表示有意义的值。
 
 
 :pending.class #=> Symbol