Attempting to parse return json from curl api call in controller
Merge remote-tracking branch 'origin/master' into json_parse

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #29 from alexung/json_parse

Json parse