testing
test sort type
Merge branch 'master' of github.com:wyliethomas/irg

Conflicts:
	db/schema.rb
added file
sort fix
easement test
encumberance fix
key feature attribute