add .travis.yml and Makefile
Merge branch 'dev' of github.com:keroxp/Diamond into dev

Conflicts:
	Makefile