update merging rules as per last meeting
[web.git] / README
2016-03-31 John Crispinadd README file