Added Andrew McConachie to the roster file.
Fixed CR NL in roster.md
Merge pull request #37 from nyborrobyn/master

added name to roster
Update lab1.md
update HTML.  need to get that hook in...
add tech-and-community slides
updating the roster with my info as somehow it didn't work the first time
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.
2nd try
3
Update roster.md
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