pulling merge
merged conflicts
fixed floating
merged
tring to fix links
removed unnecessary lines
merged
fixed linking problems
merged