Added snap, merge, and cancel

Somewhat broken:
-snapping is only diagonal
-need to finish merging functionality
-cancel works, but using "Esc" is annoying