Create my instagram feed
Merge branch 'master' of https://github.com/jamesfzhang/adayat

Conflicts:
	public/css/main.sass
	views/_photos.slim