fixed merge
added new service
fixed merge
merged master
;
step 1 designed
playing with controllers
awesome merge