Merge branch 'master' into chrisDev
Net generation, in-progress office generation, etc

- Revised pattern editor for rectangles
- Internet tile float/scale in effect
- Internet level generation
- In-progress room generation
- Hair tweaks
Level generation progress
Merge branch 'master' into chrisDev

Conflicts:
	Assets/Prefabs/Player/Player.prefab
	Assets/Scripts/OfficeRoom.cs
	Assets/Scripts/Pattern.cs
HUD Skeleton
work on #22
- Basic HUD shows score and time remaining in level.
- Fixes camera follow so that it's not broken by moving the camera's starting position.
Merge remote-tracking branch 'origin/master' into HUD

Conflicts:
	ProjectSettings/EditorBuildSettings.asset
HUD Styling
work on #22
- HUD text now matches menu text.
- Time is limited to 2 decimal places.
- "Time Remaining" changed to "Hours Remaining" (to match the AOL disc theme).
- Hopefully unfucked the HUD prefab.
Popup for Internet Time
work on #22
- Added a text popup for when the player hits a jump tile.
Government File Popup
closes #22
- Adds text popup when player collects floppies.
Merge remote-tracking branch 'origin/master' into HUD
AOl discs above jump tiles
Merge pull request #24 from RocketSurgery/HUD

Hud
Merge branch 'master' into jumptiles
Level gen progress
Merge branch 'master' into chrisDev
Merge branch 'chrisDev'
End game work
Level generation is continues forever

- Rooms have roofs so you can’t see what’s in them
- Entering rooms deletes internet and respawns it
- Fixed bug where rooms would spawn with entrances inside out
- Horrible horrible use of singleton oh god please don’t look at
NetPathmakerManager
Merge branch 'master' into chrisDev
Merge branch 'chrisDev'