Markus Tacker | http://tckr.cc/ dazu.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	markus_tacker.json
I am joing @dotHIV and cease to work freelance!
Merge pull request #58 from coderbyheart/master

Eintrag löschen.