Added credits
Updated ignore
Merge pull request #1 from atoko/master

Test pull request