Merge pull request #19 from TeamAwesome5u/master

Trying to update everything and ensure we are all on the same sheet