Commit branch.py to branch: 'branch'
Changed files
Changed the files again
Merge remote-tracking branch 'origin/Branch1'

Conflicts:
	branch.py
	hello.py
	helper.py
Merge branch 'master' of https://github.com/KSkud/CS-3240-Lab05