Merge pull request #19 from TeamAwesome5u/master

Trying to update everything and ensure we are all on the same sheet
Merge pull request #20 from TeamAwesome5u/Micah

Merge pull request #19 from TeamAwesome5u/master