#4 - adding travis configuration
#4 - should install point to an array?
Merge branch 'master' into 4_directory_structure

Conflicts:
	.travis.yml