Resolving conflict lab
Merge branch 'master' of https://github.com/dmurtari/MBU into MyBranch

Conflicts:
	Gemfile
	Gemfile~
Merge branch 'master' of https://github.com/dmurtari/MBU into MyBranch
trying to get cucumber to work
added starting features and cucumber stuff
Merging heather's branch