Merge branch 'master' of https://github.com/DerektheDev/xd-mail-compiler

Conflicts:
	app/controllers/html_controller.rb
Merge branch 'master' of https://github.com/DerektheDev/xd-mail-compiler

Conflicts:
	app/controllers/html_controller.rb