Stock added and stock gui
Fixed table errors when deleting Users from User Class
Merged master into local branch