add notes functions
Merge branch 'master' of https://github.com/qtamaki/three-d-mind into HEAD

Conflicts:
	lib/templates/erb/scaffold/show.html.erb