Creamer, 2014
Merge branch 'master' of github.com:founddrama/ng-annotated-bibliography

Conflicts:
	ng-annotated-bibliography.md