Merge branch 'stuff'
plugedit1
plugedit2
Merge branch 'plugin'
t1 1
Merge branch 't1'
t2 1
Merge branch 't2'
s1 - update
s2 - update
Merge branch 'common'
readme added
readme edited
Merge branch 'readme'
small change on stuff