handling user time input correctly
using current method for get_users
gemfile
changes for merge