Pulling alex's version
Pulling
Merge remote-tracking branch 'origin'
Changing models for database relations
Merge branch 'master' of github.com:PqBenoit/ptp

Conflicts:
	app/models/bar.rb
Modifying models to get database relations