added docs
Merge branch 'master' of https://github.com/rlbisbe/bootstrap

Conflicts:
	Makefile