controller added 2

2
merge