added comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/instagram.js
added comments