Ignore output
Merge branch 'master' of github.com:sbenthall/i290m-ocpp-site

Conflicts:
	.gitignore
.div
Merge pull request #164 from RawKStar77/master

Added initial section on discussion overview. Thoughts?
Update 060_discussion.tex
The assignment numbers were off, fixed this so the assignment number under "assignments" and "syllabus" match.
Merge pull request #165 from tomnar/master

Fixing mismatch of assignment numbers
added ignore latex aux. files
added reference bib

(from http://www.citeulike.org/user/tmaillart)
added keyword to the abstract
fixed references + added tmaillart.bib
added bib to main latex file
some draft of the background
slides Economics of Time
survey design text
Merge pull request #166 from capetroz/master

survey design text
survey_design_process
survey_design_process
added mifos info (had to research) plus minot tweaks
Update onboarding.tex