added my hello message
fixed merge conflict
fixed merge conflict 2
Merge branch 'master' of github.com:elsaturnino/comp280-fa14-week4
fixed merge conflict