user_order method getting bigger
Merge branch 'master' into api_methods

Conflicts:
	lib/orderin.rb
Merge branch 'api_methods'