let me sync
FINALLY. Added the Maze journal
Merge branch 'master' of https://github.com/sjackson212/LOTJ3

Conflicts:
	Assets/GUIController.js
	Assets/Maze.unity
	Assets/Town1.unity
	Assets/waterfall.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/metadata/07/07bc57de60e92254aab73210a8f7205d
	Library/metadata/20/2004fae423b8230428964e40f5c720e0
	Library/metadata/21/21754b380ae105d4780a0aed36239992
	Library/metadata/46/460d476087fceb249a88490d8aeba311
	Library/metadata/8a/8a7cfe3d0ad5d5c4291281b51fc935de