hotfix commit
modify a file in hotfix and master
Merge branch 'hot_fix'

test merge function
second test master
second test in hotfix
Merge branch 'hot_fix'

Conflicts:
	mac_file.rb

commit to make a new branch