Merge pull request #1 from jvalanen/mod1

My latest work compared to the original Myflix template
Merge pull request #3 from jvalanen/tmp-master

Merge pull request #1 from jvalanen/mod1