Merge branch 'master' of github.com:greenmoon55/online_tutoring_app

Conflicts:
	db/schema.rb