Merging code
Merge branch 'master' of https://github.com/DR-SIGNMEUP/SIGNMEUP

Conflicts:
	print.js