git ignore *.py~
Merge branch 'master' of https://github.com/JayFenchel/mas_thes