First commit to dev
First commit to master
adding second line on dev
resolving conflicts
resolving conflicts
Merge branch 'develop'

Conflicts:
	hello world.py