Resolving conflict lab
Merge branches 'domenic' and 'master'
Ignore emacs autosave files
Merge branches 'master' and 'domenic'
Working on many-to-many
Merge branch 'master' of https://github.com/dmurtari/MBU into MyBranch

Conflicts:
	Gemfile
	Gemfile~
Still working on many to many
Merge branch 'master' of https://github.com/dmurtari/MBU into MyBranch
trying to get cucumber to work
added starting features and cucumber stuff
Merge branches 'domenic' and 'master'
Merging heather's branch
Finish 2 features
Fixes
Merge branches 'heather' and 'master'
Merge branches 'master' and 'domenic' into domenic
Cleanup, added some step definitions