.gitignore added
Temp files removed.
fix config
Merge branch 'dev'