Makefile and Track.java added, csv's moved for testing