git made me do this
Merge branch 'master' of https://github.com/JackOfDawn/adv-sem-project2

Conflicts:
	Project2-All_Hell_Breaks_Loose/Project2-All_Hell_Breaks_Loose.v12.suo
player can swap weapons