Merge branch 'master' of https://github.com/frproulx/are213

Conflicts:
	ps1/ps1b.r
sync!
try again