tmp build
Merge pull request #3 from Magnetotail/master

Second prototype presentation - first draft
Add aasima's prototype
comma corrections
remove comments
Fix makefile if not citations exist
Merge Andy's second prototype
Changes to header info
Formatted content driven proto - table headers
Diff says whole file has changed since saving converted dos lineendings to linux
Moved couple of images to be inline
Formatted table headings
Couple of changes to formatting.
Much of the reported changes seem to be whitespace related.
Merge branch 'sidebar'

Conflicts:
	Final_Report/build/mainfile.pdf

Removed unneeded branches