merged in working app
merge
Merge pull request #22 from brain-murphy/brian-branch

Brian branch