Merge branch 'cdrost'
debug ordner gelöscht wegen konflikten
geokoordinate.h geaendert
geokoordinate.cpp geandert
TODO geputzt
Metadata auf ignore gesetzt

Conflicts:

Code/.metadata/.plugins/org.eclipse.core.resources/.history/11/e056eda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/17/a1baeca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/1f/51f7eba8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/32/c008eda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/38/b1e1eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/40/c108eda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/49/f07deda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/50/816ceca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/5d/7045eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/62/806ceca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/63/50f7eba8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/68/d12feda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/6c/9093eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/6c/f17deda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/7/b2e1eca8e6
d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/8d/d22feda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/9c/00a5eda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/a3/40d0eba8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/a3/b0e1eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/b1/9193eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/b1/d02feda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/b4/7245eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/c0/e156eda8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/d7/a0baeca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/d9/601eeca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/e7/7145eca8e
6d400131b4af839237a7541

Code/.metadata/.plugins/org.eclipse.core.resources/.history/fa/7345eca8e
6d400131b4af839237a7541
Merge branch 'master' into cdrost