Merge branch 'master' of https://github.com/permanenttourist/jquery.jqprint

Conflicts:
	jquery.jqprint-0.3.js