add if test
Merge remote-tracking branch 'upstream/master'
add string def
more complicated test
Merge pull request #5 from fantasticfears/master

string