Merge pull request #15 from ZooTypers/master

testing to see if pulling master will work
adding gen folder
Merge pull request #81 from nhlien93/master

pulling gen folder
Merge pull request #14 from ZooTypers/master

pull