Fixing lib error
Moving app/lib
Merge pull request #19 from brantunger/master

Merging local repo and group branch