deteminign location
Merge branch 'master' of github.com:cnduru/sw7

Conflicts:
	report/indhold/teori/locationDetect.tex