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
Update roster.md
roster addition for Tony Chen
Merge pull request #38 from leesajay/update-roster-take2

updating the roster with my info as somehow it didn't work the first time...
Merge branch 'master' of git://github.com/renubora/i290m-ocpp-site into renubora-master

Conflicts:
	content/pages/roster.md
Merge branch 'renubora-master'

Conflicts:
	content/pages/roster.md
update roster HTML
Merge pull request #40 from smutt/master

Assignment 1 - andrew mcConachie
added AJ