Trying to fix discrepancies between PCs

git sux
Merge branch 'master' of https://github.com/barryuhm/Aurora

Conflicts:
	Mocheeze/barrystransferspace.dmm
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mocheeze/barrystransferspace.dmm
Merge remote-tracking branch 'origin/master'