Tagging a photo with usage.
Merge branch 'master' of https://github.com/irysius/PicMe

Conflicts:
	public/app/home/library/home-library.js
Merging in usage.
Merging in usage.