end today.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/print.html
added name input and ID input. put the print div at same page and delete print.html. print works well :)