Merge pull request #80 from nhlien93/master

merging updates with master
Merge pull request #15 from ZooTypers/master

testing to see if pulling master will work