Working way through PyCharms tutorial - up to creating views
Merge remote-tracking branch 'origin/master'