updates
user inventory work
merge users current inventories into devise
style change
Merge branch 'devise' of github.com:patschreiber/nori.nu into devise