adding test two
Merge branch 'master' of https://github.com/ericraio/test_one