updated root login for phpmyadmin
updated readme
merge stuff