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
added AJ
added AJ's assignment1
Updated assignment1 with metadata
Fixed metadata in assignment1
Fix amcconachie-assign1 with proper metadata.
Adding fchasen-assign1
Updated the project I am working with
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site
Add Rodrigo's assignment 1
Add summary for Rodrigo's assignment 1
paragraph one done