added another hastag
Creating conflict
Merged and resolved conflict
Merge branch 'master' of https://github.com/heidi411/myfirstgit

Conflicts:
	draft.txt
Fixed a minor bug