pulling for update from janet
Merge branch 'master' of https://github.com/zaclolz/T4

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/Microphone/.mark
ers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/Microphone/.sync
info.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/Microphone/2.tre
e

.metadata/.plugins/org.eclipse.core.resources/.projects/TapTwistTunes/.i
ndexes/e4/81/96/69/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/TapTwistTunes/.i
ndexes/properties.index

.metadata/.plugins/org.eclipse.core.resources/.projects/TapTwistTunes/.m
arkers

.metadata/.plugins/org.eclipse.core.resources/.projects/TapTwistTunes/.m
arkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/TapTwistTunes/or
g.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org
.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/61.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4239710768.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/version.ini
	TapTwistTunes/bin/classes/com/example/taptwisttunes/Import$2.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/Import$3.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/Import$4.class
	TapTwistTunes/bin/classes/com/example/taptwisttunes/Import.class

TapTwistTunes/bin/classes/com/example/taptwisttunes/utils/TunnelPlayerWo
rkaround.class
	TapTwistTunes/bin/jarlist.cache