deleted:    .idea/.name
	deleted:    .idea/Quebert.iml
	deleted:    .idea/dictionaries/gregorydisney.xml
	deleted:    .idea/encodings.xml
	deleted:    .idea/inspectionProfiles/Project_Default.xml
	deleted:    .idea/inspectionProfiles/profiles_settings.xml
	deleted:    .idea/misc.xml
	deleted:    .idea/modules.xml
	deleted:    .idea/scopes/scope_settings.xml
	deleted:    .idea/vcs.xml
	deleted:    .idea/workspace.xml
	deleted:    autocomplete.pyc
	deleted:    shell.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	shell.log