Merge branch 'master' of /home/mateuszek/PycharmProjects/pro_tips with conflicts.
tips app