idea
Merge branch 'master' of https://github.com/Regnised/socway.git

Conflicts:
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml

Signed-off-by: Regnised <regnise@gmail.com>
add ?team=