Initial Commit/Fixed relationship stuff
commit random gemfile change
Stuff
Merge branch 'master' into Speed