pull
Merge branch 'master' of github.com:CatalEngineer03/Lessons

Conflicts:
	sensenoteclone/db/schema.rb