view updated 5feb
conflict solved in pinkup'

clear
pinkup & edit views done
Merge pull request #7 from sandyshady/master

edit & pinkup views done