passing specs
note to self
Merge branch 'local'

Conflicts:
	TODO
	spec/functional_spec.rb