added content
added img
added new content
Merge branch 'master' of github.com:dapetcu21/delta-app
added new content
Merge branch 'master' of github.com:dapetcu21/delta-app
a few correction - external links crashed
Merge branch 'master' of github.com:dapetcu21/delta-app
Merge branch 'master' of github.com:dapetcu21/delta-app
routes.geojson
fix conflicts
Merge branch 'master' of github.com:dapetcu21/delta-app

Conflicts:
	app/assets/routes.geojson
routes.geojson - positioning trails map
Merge branch 'master' of github.com:dapetcu21/delta-app
merged
Merge branch 'master' of github.com:dapetcu21/delta-app
routes.geojson - positioning on the map
Merge branch 'master' of github.com:cdinu/delta-app
Merge branch 'master' of github.com:cdinu/delta-app
added code of conduct