Added bibtex and Makefile
Manual merging
Merge remote-tracking branch 'origin/proposal' into proposal