removed useless stuff
afsd
Merge branch 'leon' of https://github.com/askho/Projects into leon

Conflicts:
	JS/main.js
	php/generateJsonMarkers.php
Find rides now loads properly

Need to show recommendations
Merge branch 'master' into leon

Conflicts:
	index.php
asdf
Revert d56f78a..4da118b

This rolls back to commit d56f78a9eb73a3b9fcbc34fb3641ece9e75d5865.
Changed comments
Merge branch 'leon'