add new chris3 file
test
Merge branch 'newchris4'
add chris5
add to six
gogo!Merge branch 'newchris6'
Merge branch 'master' of https://github.com/cmanger05/magentotest1