11_6_2013_branch
Merge pull request #1 from DaveXuStudent/11_6_2013

11_6_2013_branch
editted hello
added a new file
Merge pull request #2 from DaveXuStudent/laker_branch

Laker branch
modified hello