no message
Merge branch 'master' of https://github.com/jlandersen/sw10

Conflicts:
	Code/Animus/application<init>12.lp
	Code/Animus/application<init>9.lp
	Code/Animus/applicationgoodbye8.lp
	Code/Animus/applicationmain5.lp
	Code/Wala Exploration/src/SimpleApplication.java