merge
Merge branch 'master' of github.com:frankyni/blog_hs_ed_help

Conflicts:
	app.rb
	example.sqlite3