crud

crud 2

crud 3
.idea to .gitignore
after-merge cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.idea/workspace.xml
	main.py
	src/__init__.py
	src/load.py
	src/player.py
	test.py