first commit/basix features
commit before first push
Merge branch 'master' of github.com:Masoudkh/rails_garb

Conflicts:
	.gitignore
	README.md