-- readme cleanup
Merge branch 'dev'

Conflicts:
	README.md
	databases/databases.iml
	databases/hadoop/caao-hadoop-db.iml
-- adding missing files to the branch
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update .travis.yml
Merge branch 'master' of github.com:zafarella/caao
Merge branch 'master' into dev

Conflicts:
	README.md