Update img.js
Merge branch 'master' of git://github.com/pscanlon1/angular-placeholders into pscanlon1-master

Conflicts:
	src/img/img.js
Merge branch 'pscanlon1-master'