Merge pull request #1 from teamcoolguys/Development-Dylan

Development dylan
Merge pull request #3 from teamcoolguys/Development-Dylan

Development dylan
Merge pull request #6 from teamcoolguys/Development-Dylan

Development dylan
Merge pull request #8 from teamcoolguys/Development-Dylan

Development dylan
Felipe
Merge pull request #9 from TheSallesSpecies/Art

Felipe
Merge pull request #1 from teamcoolguys/Art

Merge pull request #9 from TheSallesSpecies/Art
Merge pull request #10 from TheSallesSpecies/Art

Art
Merge pull request #11 from TheSallesSpecies/Art

Art
Merge pull request #12 from teamcoolguys/Art

Art
Merge pull request #14 from teamcoolguys/Development-Dylan

Development dylan
Merge pull request #15 from TheSallesSpecies/Art

Art
Merge pull request #2 from teamcoolguys/master

butts-dylancomp
Merge pull request #20 from Wooyea25/master

Merge pull request #2 from teamcoolguys/master
Merge pull request #21 from teamcoolguys/Development-Dylan

Development dylan