this be Neil's first commit
this is Mark's first commit
Merge branch 'master' of github.com:SenecaCollegeBTSProjects/Team1Repo
alex's initial commit
Pushing up to bts remote
Merge remote-tracking branch 'btsRemote/master'
This is for btsRemote/master
Merge remote-tracking branch 'btsRemote/master'

Conflicts:
	README