Woops

forgot 2 commit these
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'
Dea Sprites + Civillian map fixes

Reshaping bar for gameplay uses and kitchen+botany for aesthetic. Also
includes some sprites Dea trialled with me.
Merge pull request #175 from barryuhm/master

Update my workfolder on the master drive