Removed .DS_Store, added it to the gitignore
Added cart route, added view for cart
pull from master