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

Conflicts:
	assets/includes/step3/bills.php
	generate/step-2.php