gitignore gerny
Merge branch 'master' of https://github.com/fredmontet/transmedia2014

Conflicts:
	.gitignore