OK
foo
Merge branch 'master' of https://github.com/jimpepe/HomeUse

Conflicts:
	Assignment01/LifeCycleDemo.java