REPORT
Merge branch 'master' of https://github.com/josago/aaa2013

Conflicts:
	modeladw.lp
	src/aaa/assignment3/tests/Test6.java
Merge branch 'master' of https://github.com/josago/aaa2013