added validaton for nil object for items in cart
Merge branch 'master' of https://github.com/steve-ng/cs2102-rails-site