more fixes
Merge branch 'master' of https://github.com/yubins/IAT381P2

Conflicts:
	.DS_Store