Intellij did stuff...
Merge branch 'master' of https://github.com/tubergen/swiftly4a

Conflicts:
	.idea/workspace.xml