Deleting unnecessary files

	deleted:    .idea/other.xml
	deleted:    .idea/testrunner.xml
Deleting unnecessary files
Merge remote-tracking branch 'origin/messagestarring' into messagestarring

Conflicts:
	.idea/workspace.xml
Deleting Unnecessary files