Added acknowledgements.tex
Acknowledgements.tex
Fixing merge conflicts