Worked on UI until we cried
Merge pull request #19 from jrpruit1/master

Worked on UI until we cried