everyones stuff!
merging!
german!
engerish!
contact page
Merge pull request #2 from aveldman319/gh-pages

merging from alex