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