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

Conflicts:
	.gitignore
.div
Create Stian-assign4

Thought i had submitted... but upon checking the committed assignments mine wasn't there so i'm just submitting this again
Delete 060_discussion.log
Merge pull request #162 from serang/patch-8

Create Stian-assign4
Merge pull request #163 from matnel/master

Survey copied to part of this
Removed chunk that didn't belong.
Added a section I feel belongs here. 

Feel free to remove or edit it.
Added instructions.
Added initial section on discussion overview. Thoughts?
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