git ignore and shit
Merge branch 'master' into Jake

Conflicts:
latex/balloonpaper4.pdf
Changed edition number to lay out
Fixed placeholder text and removed test references
Added resources and updated LaTeX file.
Edits 8-13-13

Edits to change in lift with altitude section
added render files
Merge branch 'Jake' into bibliography

Conflicts:
	latex/balloonpaper4.pdf
	latex/balloonpaper4.tex
	latex/sources.bib
Merge branch 'bibliography' to incorporate latest changes from Jake and Eric.