Merge branch 'aries'
Removing my IDE local files
Start using .gitignore for our own local files that shouldn't be tracked
Merge branch 'master'