maps and list all together
merging styling
Merge branch 'master' of https://github.com/tiger-swallowtails-2013/wine_and_dash_3 into changing_styling
Merge pull request #11 from tiger-swallowtails-2013/changing_styling

Changing styling