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

Conflicts:
	Code/MemoryAnalyzer/src/sw10/MemoryAnalyzer.java
	Code/Wala Exploration/src/SimpleApplication.java
	Code/Wala Exploration/src/SimpleObject.java
	Code/Wala Exploration/src/TrivialObject.java