checkpoint
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/factories/notes_factory.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Renamed/organized factories
Renamed/organized factories, updated citable concern to change Class::Subclass to class_subclass