1111
2222
ignore
ignor
workspace
delete pyc
Merge branch 'master'

Conflicts:
	.gitignore
delete misc
Merge branch 'fish'