merge
Merge branch 'master' of github.com:mntj/time_inc_front