added travis closes #5
Merge branch 'develop' of github.com:certifiedwebninja/talia into develop