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

Conflicts:
	assets/js/tumblr-ck.js
	assets/js/tumblr.js