added docs directory
merged conflict