CALVIN SAVED US! IT IS ALIVE FOR REALISES
Merge pull request #21 from berjoyner/master

CALVIN SAVED US! IT IS ALIVE FOR REALISES
getting data from server
Merge pull request #22 from shawnlknight/master

getting data from server