made changes
made 2nd changes
test edit
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story
test commit
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story into jandresTest
test commit
Merge branch 'jandresTest'

Conflicts:
	README.txt