initial
ignoring bower and dist
update and merge master