add out
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/com/example/gitexample/Work2Activity.java