andrew's answers
merge

Merge branch 'master' of github.com:aammd/UBCadv-r

Conflicts:
	.gitignore