a local comiit
Merge branch 'master' of https://github.com/k-ong/indigenous-literacy-foundation
loadinging images now works
Merge branch 'master' of https://github.com/k-ong/indigenous-literacy-foundation

Conflicts:
	db/schema.rb