Merge branch 'master' of https://github.com/gamaya/git-test

Conflicts:
	README.md

Change-Id: If11643e582fdc3de81d39100cdad121e6e6cc757
Signed-off-by: George Amaya <gamaya@email.arizona.edu>
Merge branch 'master' of https://github.com/gamaya/git-test

Conflicts:
	README.md