made a change
conflict test
Merge branch 'testing'

Conflicts:
	test.rb
the main db structure, register, login