with gen file.
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story.git
with gen files.