Test input from Eclipse -> Git
test2
Merge pull request #1 from CMPUT301W13T06/master

pull updates