edit
Merge branch 'master' of https://github.com/sally95/instagram

Conflicts:
	src/index.jade