base travis ci
Merge branch 'parser' of github.com:GISDevils/GisProject

Conflicts:
	.travis.ymlg