Updated many things, pero 99% sure na tama na sila
Merge!
Merge pull request #218 from BuracayBeach/Team_5_Version_2.0

Maraming-maraming updates. Pero 99% tama na! :DDD