Added loaction
HTML CSS ST
Merge remote-tracking branch 'james/master'

Conflicts:
	src/Loaction.html
Merge
?????????
Merge remote-tracking branch 'james/master'

Conflicts:
	src/Loaction.js
Merge error
Fixing errors
Merge remote-tracking branch 'james/master'
Merge remote-tracking branch 'george/master'
Fixed James's merge rer
Fixed HTML

Fixed HTML
Merge remote-tracking branch 'george/master'
Errors fixed

Errors fixed
index
Merge remote-tracking branch 'james/master'
added geolocation
fixed img
?
Merge remote-tracking branch 'james/master'