1.0.0
Merge branch 'master' of github.com:openstax/accounts-rails

Conflicts:
	Gemfile.lock