add sample jpg
Merge branch 'master' of https://github.com/kencharos/yakimashi
UI overray position fix.
update
Merge branch 'uiupdate'

Conflicts:
	app/views/photo.scala.html
	app/views/sheet.scala.html