Merge pull request #2 from alveyworld-dev/master

update my fork yo
Merge pull request #3 from alveyworld-dev/master

Updated functions
We uploaded our portion of the code

Christan says hi.
Merge pull request #17 from alveyworld/master

grab team 4 updates
team 6
Merge pull request #3 from alveyworld-dev/master

team 4 functions