added line and twitter account
added website to Readme
updated readme
fixed merge