adds inventory and anagram activity/view
resolves merge conflicts
Merge pull request #30 from clc4/master

Adds inventory and anagram view/activity