todo: pile.py -> chop_marker()
Merge branch 'master' of github.com:HerrMuellerluedenscheid/msc
Merge branch 'master' of github.com:HerrMuellerluedenscheid/msc

Conflicts:
	todo.txt
Merge branch 'master' of github.com:HerrMuellerluedenscheid/msc
added cite and MSc proposal