add picture controller, views, routes
merge