Merge branch 'master' into dev
add Cakefile
remove concat functions. for now, will build

before pushing to live server
add readme
Merge branch 'dev'