.gitignore update
.gitignore update
Merge branch 'master' of https://github.com/kademika/jd-aug14-ingvarr-semeon.git