New functionality - #4

Open

shearpaladin wants to merge 8 commits into

CMPUT-301:masterfrom

shearpaladin:new-functionality

Commits on Oct 28, 2019

fail pls
shearpaladin
committed
fe15925
travis
shearpaladin
committed
de4e1ec
resetmaster
shearpaladin
committed
37ab66c
FAIL
shearpaladin
committed
e3849a8

Commits on Oct 29, 2019

GIVE ME FAIL
shearpaladin
committed
5532a0e
TEST 3
shearpaladin
committed
19d90ed
COME ON
shearpaladin
committed
ae2a953
Fix conflict
shearpaladin
committed
8ea3aa2