Merge branch 'master' of C:\HappySaturday\Sniffsters\Sniffsters\Scripts\app\profile with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/styles/Profile.css
	test/spec/controllers/AboutCtrlSpec.js
	test/spec/controllers/AboutCtrlSpec.js.map
	test/spec/controllers/AboutCtrlSpec.ts
	test/spec/controllers/PhotosCtrlSpec.js
	test/spec/controllers/PhotosCtrlSpec.js.map
	test/spec/controllers/PhotosCtrlSpec.ts
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Grunt Remove Controller