added bar.
Merge remote-tracking branch 'origin/master' into foo
breaking foo
Merge pull request #1 from illwrath/foo

Foo