MODIFY README

add links and some miscellaneous things to readme
MODIFY README
RESOLVE conflicts