Added join function
Added specs
Merge branch 'master' of github.com:EmergeAdapt/expressive
merge conflicts