somehow managed to avoid git hell; added usernames