adds profile picture
fixes merge conflict
Merge pull request #18 from markableidinger/views

Views