small fix, add paper Makefile
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Makefile sources should be all tex files
format textwidth
Merge remote-tracking branch 'origin/master'

Conflicts:
	proposal/Makefile
Makefile depends on all bib files