added merge button
Merge branch 'master' of https://github.com/grisetti/g2o_frontend
pwn merger now works
solved a conflict