stuff
finished styling
fixed some merge conflicts
Merge branch 'master' of github.com:awanderingorill/snippets into tile_integration