Merge pull request #17 from jrpruit1/master

Merge conflicts and UI adjustments
Merge pull request #18 from jrpruit1/master

Fixed cross-OS issue
Merge pull request #19 from jrpruit1/master

Worked on UI until we cried
Fixed UI