also to ignore
Merge branch 'master' of https://github.com/sjpanda/transaction.git

Conflicts:
	transaction/bin/fr/upmc/aladyn/transactionables/injection/Injection$1.class
	transaction/src/fr/upmc/aladyn/transactionables/injection/Injection.java
Merge branch 'master' of https://github.com/sjpanda/transaction.git
to ignore