Entered my data to the roster.md
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
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site
paragraph one done
paragraph two done
paragraph three done
paragraph four done
Final edit for a first version of assignment 1
Merge pull request #56 from tomnar/master

Add TQuast's assignment 1