LOW: adding temp file to gitignore
Merge branch '1.1' of https://github.com/openflexo-team/gina.git into 1.1
Merge branch '1.1' of https://github.com/openflexo-team/gina.git into 1.1