added comments
Merge branch 'init'
more info on -u
Merge branch 'init'
resolved conflict
ci -m
Merge branch 'basic'
Merge branch 'init'