Did something. Removed duplicate code for testing at cost of browser console error
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/instagram.js