Moves towards connecting idea
.
Merge branch 'tutorial_merge'

Conflicts:
	lib/app_engine.rb
creates a basic YAML database