Merge pull request #2 from TeamKeyblade/master

Update Forked Repo #2
Update spanishmackerel

finish!
Merge pull request #22 from japoina92/master

Update spanishmackerel