added .gitingore. neat.
Merge branch 'feature' into develop