Testing pull request
Merge pull request #1 from BlockadiaTeam/master

11
Merge pull request #3 from pslam92117/master

Merge pull request #1 from BlockadiaTeam/master
Merge remote-tracking branch 'origin/master' into Alex-Branch
Fixed arrayoutofboundexception
Merge pull request #4 from yang6lang1/master

new request
Merge pull request #2 from BlockadiaTeam/master

Update