remove up folder
Merge branch 'master' of github.com:Lughino/basi

Conflicts:
	.idea/workspace.xml