(Ross) Updated user_helper.c to take command line arguments
Merge branch 'master' into wait_queues

Update to wait_queues made by Ross