update
Merge branch 'master' of https://github.com/jwatki06/Day12-PiJ

Merge sorted

Conflicts:
	.gitignore