git stash conflict resolved
Merge branch 'master' of github.com:mikobautista/BattleStocks