Added exercise functionality
Removed Animal Object From Constructors
Merge branch 'clase6'

Conflicts:
	.DS_Store
	tamagochiApp/.DS_Store
	tamagochiApp/tamagochiApp/.DS_Store
	tamagochiApp/tamagochiApp/UIViews/mainView/mainViewController.m
	tamagochiApp/tamagochiApp/UIViews/mascotView/mascotViewController.h
	tamagochiApp/tamagochiApp/UIViews/mascotView/mascotViewController.m