Merge pull request #41 from TeamAwesome5u/Micah

Micah
Merge pull request #46 from TeamAwesome5u/Micah

Micah
Merge pull request #47 from TeamAwesome5u/Micah

Micah
Merge pull request #55 from TeamAwesome5u/Micah

Micah
Merge remote-tracking branch 'origin/master' into Micah