Project 2 Update

-Switched locations belonging to items to a more logical set up where
items belong to locations.
-Serious issue with an nullpointerexception error message.