asdfg
Merge branch 'master' of https://github.com/twitzel/Serialmango

Conflicts:
	.idea/workspace.xml