added xome testing gems
Merge branch 'gems'

Behind on the merges, trying to catch up
Merge branch 'master' of https://github.com/zelzel2315/PayUp

Conflicts:
	app/views/users/index.html.erb

Trying this again