update

+compile program, still being built
+small changes in code
Merge remote-tracking branch 'origin/master'

Conflicts:
	.travis.yml