first commit, giving this a shot
Merge branch 'master' of https://github.com/idanbeck/testjunk