Fix conflicts.
Merge branch 'master' of github.com:wyvernlang/wyvern

Conflicts:
	tools/src/wyvern/tools/typedAST/extensions/values/Obj.java