Grunt Remove Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/PhotosCtrl.js
	app/scripts/controllers/PhotosEditCtrl.js
	app/scripts/controllers/PuppiesCtrl.js
	app/scripts/controllers/PuppiesEditCtrl.js
	app/scripts/controllers/TestimonialsCtrl.js
	app/scripts/controllers/TestimonialsEditCtrl.js
	app/scripts/directives/aboutInfo.js
	app/scripts/directives/lookerDetails.js
	app/scripts/directives/photosInfo.js
	app/scripts/directives/photosInfoEdit.js
	app/scripts/directives/puppiesInfo.js
	app/scripts/directives/puppiesInfoEdit.js
	app/scripts/directives/testimonialsInfo.js
	app/scripts/directives/testimonialsInfoEdit.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Grunt Remove Controller