logining in stuff
working on adding to cart
merging
Merge branch 'master' of https://github.com/csc456fall2014/team2-pizza-tracker