added userprefs to ignore
Merge branch 'master' of https://github.com/specialk1337/COMP476_AdvGameDev

Conflicts:
	ApocalypseWar/ApocalypseWar.userprefs