adding a bib entry (NSF: A vision and strategy for software for science, engineering and education)
typo
Merge branch 'master' of github.com:larskotthoff/recomputation-ss-paper

Conflicts:
	SummerSchoolPaper/intro.tex
	SummerSchoolPaper/paper.bib
paper.bib
fixing conflict in paper.bib
adding a reference to obstacles