merge
 Merge branch 'master' of https://github.com/alexcazacu/stockfight