Merge branch 'master' into cleanup
[philo.git] / .gitignore
1 *.pyc
2 *~
3 *#
4 TODO