Merged, edited readme file