added view 2
added segue
merge