merged branches

 also changed bottom contact links