Merge branch 'master' of github.com:harvard-lil/awesome

Conflicts:
	.gitignore
Merge branch 'master' into develop