modified:   isochrone/bin/ch/epfl/isochrone/geo/PointWGS84.class
	modified:   isochrone/src/ch/epfl/isochrone/geo/PointOSM.java
Merge https://github.com/essaic/Isochrone

Conflicts:
	isochrone/bin/ch/epfl/isochrone/geo/PointWGS84.class

	new file:   isochrone/bin/.gitignore
	modified:   isochrone/src/ch/epfl/isochrone/geo/PointWGS84.java
Merge branch 'master' of https://github.com/essaic/Isochrone

Conflicts:
	isochrone/bin/ch/epfl/isochrone/geo/PointWGS84.class

	modified:   isochrone/.classpath
	deleted:    isochrone/bin/.gitignore
	deleted:    isochrone/bin/ch/epfl/isochrone/Math.class
	modified:   isochrone/bin/ch/epfl/isochrone/geo/PointWGS84.class
	new file:   isochrone/bin/ch/epfl/isochrone/math/Math.class
	deleted:    isochrone/src/ch/epfl/isochrone/Math.java
	modified:   isochrone/src/ch/epfl/isochrone/geo/PointWGS84.java
	new file:   isochrone/src/ch/epfl/isochrone/math/Math.java
Merge branch 'master' of https://github.com/essaic/Isochrone

Conflicts:
	isochrone/.classpath

	deleted:    isochrone/.classpath
	deleted:    isochrone/.project
	deleted:    isochrone/.settings/org.eclipse.jdt.core.prefs
	deleted:    isochrone/bin/ch/epfl/isochrone/geo/PointOSM.class
	deleted:    isochrone/bin/ch/epfl/isochrone/geo/PointWGS84.class
	modified:   isochrone/src/ch/epfl/isochrone/geo/PointWGS84.java