subject and standard module added through habtm
code pulled
schema.rd updated
subject module added and correctly merged
Merge branch 'subjectmodule'

Conflicts:
	db/schema.rb