commiting my changes
Merge branch 'master' of github.com:powerloon/cs362

Conflicts:
	lab3/rts.cc
Merge branch 'master' of github.com:powerloon/cs362
working on rts like a software engineer