Updated TestApp.
Merge branch 'roman/scroll'

Conflicts:
	app.go