Merge pull request #2 from manzalena/master

pull request
added hi
filled out list