added foo2
Merge branch 'master' of git://github.com/jdev91/test