Merge

Branch merging problems again, so I removed the problem Which is
between “<<<< HEAD” and “>>>> FETCH_HEAD”
Also trying to solve the gravity-crap!