add path
add compsoer alias
Merge branch 'master' into macbook
Merge branch 'macbook'
remove composer path