#6 , #8 done
Merge branch 'master' of github.com:N-Porsh/DJ-PROMO