Temporary changes
Merge
Local merge
Old local changes

Merge branch 'master' of github.com:louhos/takomo

Conflicts:
	.gitignore
Merge branch 'master' of github.com:louhos/takomo
Merge branch 'master' of github.com:louhos/takomo
Remove .InstallMarginal