Merge pull request #1 from spinfojava/master

git_intro - up from spinfojava
animal_farm - added
git intro - up
Merge pull request #30 from fmondaca/master

praktikum - up