combined the two readme files