syncing up
syncing
Merge branch 'master' of https://github.com/Al153/Programming
fixing conflict

Conflicts:
	Python/Pi/hexpi.py