Added my working versions
Merge branch 'aon'

Conflicts:
	Gemfile
	Gemfile.lock