presentation
Merge branch 'master' of https://github.com/KarinnHemingway/Rub_Me

Conflicts:
	findmt/db/schema.rb
changed schema