you know, doing stuff in the client
Merge branch 'adding-icons-and-doing-stuff'