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
First notes
roster addition for Tony Chen
added AJ
added AJ's assignment1
Merge branch 'master' of github.com:sbenthall/i290m-ocpp-site into matnel_assingment
right folder
Link to details about assignment 1
Added LocalWiki
Assignment 1.
Lisa Jervis A1 submission