merge conflict 2
i
merge commitMerge branch 'master' of https://github.com/moxtra/Developer2.0
more edits