instagram images
Merge branch 'master' of github.com:samuel-hill/ga-wdi-hackathon

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
instagram photos working, styling not finished