Fav Color
Merge branch 'master' of https://github.com/gmedrano/GA-GIT-Training

Conflicts:
	hello.txt
Conflict is gone.
Merge branch 'master' of https://github.com/gmedrano/GA-GIT-Training