remove gitignore item
fixed conflict

Conflicts:
	views/subviews/print.html