commit
Merge branch 'master' of https://github.com/kjaylee/iwish

Conflicts:
	.DS_Store
commit
commit
commit
Merge branch 'master' of https://github.com/kjaylee/iwish