Merge branch 'master' into develop
Removing diet from ignore
Ignore idea
-n 
adding dist