cleaned up
modified .gitignore
Merge branch 'dev'