stupid print
resolved conflict

Conflicts:
	viewTag.php