Initial Project
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/IndexCtrl.js
	app/scripts/models/IBreederProfile.js
	app/scripts/services/DataService.js
Initial Project
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/controllers/IndexCtrl.js
	app/scripts/models/IBreederProfile.js
	app/scripts/services/DataService.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Generated_files.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Initial Project