getting data from server
Merge pull request #22 from shawnlknight/master

getting data from server