merge changes
Added travis integration
fixed travis
Merge pull request #1 from Zomis/ecs

Ecs