updated paint demo
updated readme
fixed conflict