Added Leon's stuff
Merge branch 'leon'

Conflicts:
	JS/main.js
	index.php
	php/generateJsonMarkers.php
Updated Style.css
index.php with styling
JQuery mobile CSS update
Profile Page Edits
lol lukasz sucks

undeleted shit
Merge branch 'master' into leon

Conflicts:
	index.php
	style/style.css