Added Andrew McConachie to the roster file.
Fixed CR NL in roster.md
Entered my data to the roster.md
Adding Christina Pham to roster
Adding name to roster.md
Adding my name to the roster
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site

Conflicts:
	content/pages/roster.md
solving merge conflict
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site

Conflicts:
	content/pages/roster.md
deleting temp file
Matti Nelimarkka's contributions
updating the roster with my info as somehow it didn't work the first time
First notes
correcting bad dates on syllabus
add information about assignment 1
update HTML
update html on changes to assign1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	content/pages/roster.md
First try at assignment 1.