getname
Merge branch 'master' into post

Conflicts:
	public/js/script.js
	public/js/templates.html
name display
change
c
Merge branch 'post'