Added .travis.yml file to project
Merge branch 'master' of https://github.com/ancosen/EasyJSON

Conflicts:
	.travis.yml
Added .travis.yml to project