Added Andrew McConachie to the roster file.
Fixed CR NL in roster.md
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
Merge pull request #40 from smutt/master

Assignment 1 - andrew mcConachie
removed assignment that did not compile
Merge branch 'master' of github.com:sbenthall/i290m-ocpp-site into matnel_assingment
right folder