Oops
Added resign
Merge branch 'dev2' into shoppingCart