Fixing production bugs
Merge branch 'master' of github.com:jdeslangles/project2
working on unified interface
Making progress on styling and bug fixing
Merge branch 'master' into styling