untracking .idea
Merge branch 'master' of https://github.com/mwalzer/Fred2
ignoring *.pyc
Merge branch 'master' of https://github.com/mwalzer/Fred2