this is the retarded way to use git, but w/e..collision works in this version, have fun with it
Merge branch 'master' of github.com:UBC-Victorious-410/project