second commit, all files untill now (started without repo)
Merge branch 'master' of github.com:Timon87/tv_project