initial Commit
second stage
new file
new commit
asdasd
Merge branch 'develop'
conflict
conflict
Merge branch 'develop'

Conflicts:
	LICENSE
Merge remote-tracking branch 'origin/master'