Merge branch 'master' of https://github.com/timurgen/int_app_oblig4.git