Initial import
Setting up travis CI testing
Merge remote-tracking branch 'github/master'

Conflicts:
	README.md