4_24A
Merge branch 'master' of https://github.com/apblossom/Dr_smartypants_mySQL

Conflicts:
	.idea/workspace.xml
	db/schema.rb