add .idea to .gitignore
untrack files
remove .iml file from git tracking
modify .gitignore
Merge branch 'development' of https://github.com/TheEndIsNear/HeadFirstOOAD into development