added *.eps to .gitignore
changed my mind about the .eps
Merge branch 'master' of bitbucket.org:dsr/multipy
merge
Merge remote-tracking branch 'origin/master'