add gitignore
blödsinn
Revert Blödsinn
Merge branch 'gh-pages' into mein-test-branch

Conflicts:
	README.md
Revert "blödsinn"

This reverts commit ed29d417b0d2283ff8124622861b4d390a1b4ae7.
Revert "Revert "blödsinn""

This reverts commit ac8b6f2ed02c698a71016bc2d043d90c4b785421.
Merge pull request #4 from fh-koeln/mein-test-branch

Revert Blödsinn
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Merge branch 'gh-pages' into BigData-Projekt
Merge branch 'BigData-Projekt' of https://github.com/fh-koeln/wba1-2014 into BigData-Projekt