about to pull from developemnt
fixed merge conflicts
Merge pull request #41 from simensta/custom-items

Custom items