Added Andrew McConachie to the roster file.
Fixed CR NL in roster.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	content/pages/roster.md
First try at assignment 1.
2nd try
3
Merge pull request #40 from smutt/master

Assignment 1 - andrew mcConachie