Fixed bug changing quantity to cart
Orderhistory created an working towards database now
Merge branch 'master' of https://github.com/JonathanThunberg/Dat076
Fixed mergeconflict
Merge branch 'master' of https://github.com/JonathanThunberg/Dat076