Cucumber and table
Merge branch 'master' of github.com:mndeguzman/BBEF

Conflicts:
	Gemfile.lock
gemflielock
Merge branch 'master' of github.com:mndeguzman/BBEF