Conflicts:
	Foo.php
Squashed commit of the following:
    Added foo3 setter/getter
    Added foo3
    Commit from command line.
    Added file.txt
    Change3
    Change2