few changes to American Dream boss.
Tried fixing bubbles, Bubbles as an area is just generally fucked.
Lots of changes.
Removed Herobrine.
Merge remote-tracking branch 'origin/J'

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx
Merge remote-tracking branch 'origin/Zargy'

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx
	The Midnight Station.gmx/The Midnight Station.project.gmx.orig