cart setup almost done
working on ajax cart calls
fixed merge conflicts