modified .gitignore: ignoring .idea folder
Merge branch 'master' of https://github.com/c58/StudyTime