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