merge
Merge branch 'master' of https://github.com/lib4/libra

Conflicts:
	bin/R.txt
intial deliverable