1390674224
Merge branch 'master' of https://github.com/tdj28/demo_jones_2014

Conflicts:
	AdditionalSRC/report.pdf
1390674558