Acknowledgement
Merge branch 'master' of https://github.com/blexim/synth
Acknowledgements

Conflicts:
	paper/paper.tex