adding stam
Merge branch 'master' of http://github.com/zoharpeleg/test2-repo