new file:   Tampomat/.classpath
	new file:   Tampomat/.project
	new file:   Tampomat/bin/Tampomat.class
	new file:   Tampomat/bin/controller/CONSTANTS.class
	new file:   Tampomat/bin/controller/Communication$1.class
	new file:   Tampomat/bin/controller/Communication$2.class
	new file:   Tampomat/bin/controller/Communication.class
	new file:   Tampomat/bin/controller/Controller.class
	new file:   Tampomat/bin/gui/Commands.class
	new file:   Tampomat/bin/gui/Outputs.class
	new file:   Tampomat/bin/gui/Sensors.class
	new file:   Tampomat/launch.bat
	new file:   Tampomat/lib/INSTALL.txt
	new file:   Tampomat/lib/Mac_OS_X/librxtxSerial.jnilib
	new file:   Tampomat/lib/RXTXcomm.jar
	new file:   Tampomat/make.bat
	new file:   Tampomat/src/Tampomat.java
	new file:   Tampomat/src/controller/CONSTANTS.java
	new file:   Tampomat/src/controller/Communication.java
	new file:   Tampomat/src/controller/Controller.java
	new file:   Tampomat/src/gui/Commands.java
	new file:   Tampomat/src/gui/Outputs.java
	new file:   Tampomat/src/gui/Sensors.java
Merge branch 'master' of https://github.com/bloodscalp/erts-project