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
Level gen progress
Merge branch 'master' into chrisDev
Merge branch 'chrisDev'