Merge pull request #8 from gholtsla/master

Fixing many of the issues and fleshing out the app
Fixing a bunch of issues and making things better
Merge pull request #12 from gholtslander-va/patch2

Fixing a bunch of issues and making things better
Merge pull request #1 from gholtslander-va/master

Updates