Composer
Merge branch 'master' of https://github.com/thechristopherbruce/currency_project

Conflicts:
	generate/step-4.php