placeholder
Merge branch 'master' into develop
angular initial commit
add travis file
Merge pull request #15 from bitdewy/develop

merge dev to master