update
Merge pull request #42 from shahverdy/master

I added Persian to translations
Spanish strings
farsi!
more translation stuff
update
Merge branch 'master' of https://github.com/shahverdy/csslayoutsite into shahverdy-master

Conflicts:
	translations/fa.yaml
fixed syntax error in persian translation file
update zh.yaml
update zh.yaml
update zh.yaml
Added German translation file
german translation for the home page
fixed copy paste error
New file with Gern^man translation

Only the first 62 lines are translated now and I use the formal "Sie".
Merge pull request #51 from zu/master

First part of German translation (not finished)
update zh.yaml
Merge pull request #1 from incompl/master

merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	translations/de.yaml
fixed lines

Fixed missing lines according to the english original to maintain
documents readability